fix snapshot tests again

calyxir · Jul 15, 2024 · c098ef3 · c098ef3
1 parent ec39d7e
commit c098ef3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 31 deletions.
diff --git a/fud2/tests/snapshots/tests__list_ops.snap b/fud2/tests/snapshots/tests__list_ops.snap
@@ -49,8 +49,8 @@ source: fud2/tests/tests.rs
     ),
     (
         "debug",
-        "calyx",
-        "debug",
+        "cider",
+        "cider-debug",
     ),
     (
         "firrtl",
@@ -87,11 +87,6 @@ source: fud2/tests/tests.rs
         "verilog-refmem-noverify",
         "sim",
     ),
-    (
-        "interp",
-        "calyx",
-        "dat",
-    ),
     (
         "mrxl-to-calyx",
         "mrxl",

diff --git a/fud2/tests/snapshots/tests__list_states.snap b/fud2/tests/snapshots/tests__list_states.snap
@@ -4,10 +4,10 @@ source: fud2/tests/tests.rs
 [
     "calyx",
     "cider",
+    "cider-debug",
     "cocotb-axi",
     "dahlia",
     "dat",
-    "debug",
     "firrtl",
     "firrtl-with-primitives",
     "mrxl",

diff --git a/fud2/tests/snapshots/tests__test@plan_cider.snap b/fud2/tests/snapshots/tests__test@plan_cider.snap
@@ -32,18 +32,9 @@ rule calyx-with-flags
 
 cider-exe = $calyx-base/target/debug/cider
 cider-converter = $calyx-base/target/debug/cider-data-converter
-rule cider
-  command = $cider-exe -l $calyx-base --raw --data data.json $in > $out
-rule cider-debug
-  command = $cider-exe -l $calyx-base --data data.json $in debug || true
+rule run-cider-debug
+  command = $cider-exe -l $calyx-base --data data.dump $in debug || true
   pool = console
-build interp-dat.py: get-rsrc
-python = python3
-rule dat-to-interp
-  command = $python interp-dat.py --to-interp $in
-rule interp-to-dat
-  command = $python interp-dat.py --from-interp $in $sim_data > $out
-build data.json: dat-to-interp $sim_data | interp-dat.py
 rule run-cider
   command = $cider-exe -l $calyx-base --data data.dump $in > $out
 rule dump-to-interp

diff --git a/fud2/tests/snapshots/tests__test@plan_debug.snap b/fud2/tests/snapshots/tests__test@plan_debug.snap
@@ -34,18 +34,9 @@ rule calyx-with-flags
 
 cider-exe = $calyx-base/target/debug/cider
 cider-converter = $calyx-base/target/debug/cider-data-converter
-rule cider
-  command = $cider-exe -l $calyx-base --raw --data data.json $in > $out
-rule cider-debug
-  command = $cider-exe -l $calyx-base --data data.json $in debug || true
+rule run-cider-debug
+  command = $cider-exe -l $calyx-base --data data.dump $in debug || true
   pool = console
-build interp-dat.py: get-rsrc
-python = python3
-rule dat-to-interp
-  command = $python interp-dat.py --to-interp $in
-rule interp-to-dat
-  command = $python interp-dat.py --from-interp $in $sim_data > $out
-build data.json: dat-to-interp $sim_data | interp-dat.py
 rule run-cider
   command = $cider-exe -l $calyx-base --data data.dump $in > $out
 rule dump-to-interp
@@ -54,6 +45,6 @@ rule interp-to-dump
   command = $cider-converter --to json $in > $out
 build data.dump: dump-to-interp $sim_data | $cider-converter
 
-build /output.ext: cider-debug /input.ext | data.json
+build /output.ext: run-cider-debug /input.ext | data.dump
 
 default /output.ext