Skip to content

v0.2.53..v0.2.54 changeset ConflateCmdTest.sh

Garret Voltz edited this page Mar 31, 2020 · 1 revision
diff --git a/test-files/cmd/slow/ConflateCmdTest.sh b/test-files/cmd/slow/ConflateCmdTest.sh
index 6b27c76..93f4ab1 100755
--- a/test-files/cmd/slow/ConflateCmdTest.sh
+++ b/test-files/cmd/slow/ConflateCmdTest.sh
@@ -7,8 +7,8 @@ mkdir -p test-output/cmd/slow/ConflateCmdTest
 export CONFLATE_OPTS="-C Testing.conf -C UnifyingAlgorithm.conf -C ReferenceConflation.conf"
 
 hoot conflate $CONFLATE_OPTS test-files/conflate/unified/AllDataTypesA.osm test-files/conflate/unified/AllDataTypesB.osm test-output/cmd/slow/ConflateCmdTest/output.osm
-hoot diff test-output/cmd/slow/ConflateCmdTest/output.osm test-files/cmd/slow/ConflateCmdTest/output.osm || diff test-output/cmd/slow/ConflateCmdTest/output.osm test-files/cmd/slow/ConflateCmdTest/output.osm
+hoot diff -C Testing.conf test-output/cmd/slow/ConflateCmdTest/output.osm test-files/cmd/slow/ConflateCmdTest/output.osm || diff test-output/cmd/slow/ConflateCmdTest/output.osm test-files/cmd/slow/ConflateCmdTest/output.osm
 
 # Check to make sure we don't bomb out on empty files
 hoot conflate $CONFLATE_OPTS --warn test-files/Empty.osm test-files/Empty.osm tmp/ConflateCmdTest.osm
-hoot diff test-files/Empty.osm tmp/ConflateCmdTest.osm || cat tmp/ConflateCmdTest.osm
+hoot diff -C Testing.conf test-files/Empty.osm tmp/ConflateCmdTest.osm || cat tmp/ConflateCmdTest.osm
Clone this wiki locally