Merge pull request #119 from vacantron/hotfix

Fix snapshot test
sysprog21 · Mar 19, 2024 · 6999393 · 6999393
2 parents 0ba28d1 + cd17c30
commit 6999393
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/tests/check-snapshots.sh b/tests/check-snapshots.sh
@@ -12,7 +12,12 @@ function check_snapshot() {
 
     $SHECC --dump-ir -o $temp_exe $source &>/dev/null
     dot -Tdot_json -o $temp_json CFG.dot
-    diff -q <(cat $ref) <(sed -E "/0x[0-9a-f]+/d" $temp_json | jq -S -c .)
+    diff -q <(cat $ref) \
+            <(sed -E "/0x[0-9a-f]+/d" $temp_json | \
+                jq -S -c '.edges |= sort_by(._gvid) | .objects |= sort_by(._gvid) |
+                            .objects |= map_values(.edges |= (. // [] | sort)) |
+                            .objects |= map_values(.nodes |= (. // [] | sort)) |
+                            .objects |= map_values(.subgraphs |= (. // [] | sort))')
 }
 
 for file in tests/*.c; do

diff --git a/tests/snapshots/fib.json b/tests/snapshots/fib.json
diff --git a/tests/snapshots/hello.json b/tests/snapshots/hello.json
diff --git a/tests/update-snapshots.sh b/tests/update-snapshots.sh
@@ -13,7 +13,10 @@ function update_snapshot() {
     $SHECC --dump-ir -o $temp_exe $source &>/dev/null
     dot -Tdot_json -o $temp_json CFG.dot
     sed -i -E "/0x[0-9a-f]+/d" $temp_json
-    jq -S -c . $temp_json > $dest
+    jq -S -c '.edges |= sort_by(._gvid) | .objects |= sort_by(._gvid) |
+                .objects |= map_values(.edges |= (. // [] | sort)) |
+                .objects |= map_values(.nodes |= (. // [] | sort)) |
+                .objects |= map_values(.subgraphs |= (. // [] | sort))' $temp_json > $dest
 }
 
 for file in tests/*.c; do