-
Notifications
You must be signed in to change notification settings - Fork 74
v0.2.53..v0.2.54 changeset NetworkConflateCmdTest.sh
Garret Voltz edited this page Mar 31, 2020
·
1 revision
diff --git a/test-files/cmd/glacial/NetworkConflateCmdTest.sh b/test-files/cmd/glacial/NetworkConflateCmdTest.sh
index 572c26c..067e599 100755
--- a/test-files/cmd/glacial/NetworkConflateCmdTest.sh
+++ b/test-files/cmd/glacial/NetworkConflateCmdTest.sh
@@ -6,18 +6,18 @@ mkdir -p test-output/cmd/glacial/NetworkConflateCmdTest
HOOT_OPTS="-D uuid.helper.repeatable=true -D writer.include.debug.tags=true"
-hoot conflate -C Testing.conf --warn -C ReferenceConflation.conf -C NetworkAlgorithm.conf \
+hoot conflate --warn -C ReferenceConflation.conf -C NetworkAlgorithm.conf -C Testing.conf \
$HOOT_OPTS \
test-files/DcGisRoads.osm test-files/DcTigerRoads.osm \
test-output/cmd/glacial/NetworkConflateCmdTest/output.osm
-hoot diff test-output/cmd/glacial/NetworkConflateCmdTest/output.osm \
+hoot diff -C Testing.conf test-output/cmd/glacial/NetworkConflateCmdTest/output.osm \
test-files/cmd/glacial/NetworkConflateCmdTest/output.osm || \
diff test-output/cmd/glacial/NetworkConflateCmdTest/output.osm \
test-files/cmd/glacial/NetworkConflateCmdTest/output.osm
# Check to make sure we don't bomb out on empty files
-hoot conflate -C Testing.conf --warn -C ReferenceConflation.conf -C NetworkAlgorithm.conf \
+hoot conflate --warn -C ReferenceConflation.conf -C NetworkAlgorithm.conf -C Testing.conf \
$HOOT_OPTS test-files/Empty.osm test-files/Empty.osm tmp/NetworkConflateCmdTest.osm
-hoot diff test-files/Empty.osm tmp/NetworkConflateCmdTest.osm || cat tmp/NetworkConflateCmdTest.osm
+hoot diff -C Testing.conf test-files/Empty.osm tmp/NetworkConflateCmdTest.osm || cat tmp/NetworkConflateCmdTest.osm