Fixes failing test's actual equivalent output as expected

HazyResearch · Jan 31, 2016 · 4997d1d · 4997d1d
1 parent 97d6603
commit 4997d1d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -46,6 +46,14 @@ test: export CLASSPATH = $(realpath $(JAR))
 
 endif # TEST_JAR
 
+actual-expected:
+	for expected in test/*/*/*.expected; do \
+	    actual=${expected%.expected}.actual; \
+	    [[ "$actual" -nt "$expected" ]] && \
+	    ! diff -q "$actual" "$expected" || continue; \
+	    cp -vf "$actual" "$expected"; \
+	done
+
 # test coverage report
 .PHONY: test-coverage coveralls
 test-coverage:

diff --git a/test/expected-output-test/multiple_rules_for_same_head/compile.expected b/test/expected-output-test/multiple_rules_for_same_head/compile.expected
@@ -171,7 +171,7 @@ FROM R R0
         WHERE R1.a = R0.x  AND R0.x > 1000"""
           function: "Imply(Q.R0.label)"
           weight: "?(dd_weight_column_0)"
-          dependencies: [ "ext1_S_by_f" ,  "ext_S" ,  "ext_S_by_f_1" ,  "ext_S_by_f" ]
+          dependencies: [ "ext_S_by_f" ,  "ext_S" ,  "ext1_S_by_f" ,  "ext_S_by_f_1" ]
           input_relations: [
             Q
             S
@@ -186,7 +186,7 @@ FROM R R0
         WHERE R1.a = R0.x  AND R0.x = 0"""
           function: "Imply(Q.R0.label)"
           weight: "1.0"
-          dependencies: [ "ext1_S_by_f" ,  "ext_S" ,  "ext_S_by_f_1" ,  "ext_S_by_f" ]
+          dependencies: [ "ext_S_by_f" ,  "ext_S" ,  "ext1_S_by_f" ,  "ext_S_by_f_1" ]
           input_relations: [
             Q
             S
@@ -201,7 +201,7 @@ FROM R R0
         WHERE R2.a = R0.x  AND R3.a = R0.x  AND R3.b = R1.x  AND R4.a = R1.x """
           function: "Imply(Q.R0.label, Q.R1.label)"
           weight: "?(dd_weight_column_0)"
-          dependencies: [ "ext1_S_by_f" ,  "ext_S" ,  "ext_S_by_f_1" ,  "ext_S_by_f" ]
+          dependencies: [ "ext_S_by_f" ,  "ext_S" ,  "ext1_S_by_f" ,  "ext_S_by_f_1" ]
           input_relations: [
             Q
             S
@@ -217,7 +217,7 @@ FROM R R0
         WHERE R2.a = R0.x  AND R3.a = R0.x  AND R3.b = R1.x  AND R4.a = R1.x  AND (R0.x + R1.x) < 1000"""
           function: "Imply(Q.R0.label, Q.R1.label)"
           weight: "-10.0"
-          dependencies: [ "ext1_S_by_f" ,  "ext_S" ,  "ext_S_by_f_1" ,  "ext_S_by_f" ]
+          dependencies: [ "ext_S_by_f" ,  "ext_S" ,  "ext1_S_by_f" ,  "ext_S_by_f_1" ]
           input_relations: [
             Q
             S