Skip to content

v0.2.52..v0.2.53 changeset ConflateCmdStatsGenericRiversTest.sh

Garret Voltz edited this page Feb 12, 2020 · 1 revision
diff --git a/test-files/cmd/slow/ConflateCmdStatsGenericRiversTest.sh b/test-files/cmd/slow/ConflateCmdStatsGenericRiversTest.sh
index 91874e7..e2f3de0 100755
--- a/test-files/cmd/slow/ConflateCmdStatsGenericRiversTest.sh
+++ b/test-files/cmd/slow/ConflateCmdStatsGenericRiversTest.sh
@@ -1,11 +1,15 @@
 #!/bin/bash
 set -e
 
-mkdir -p test-output/cmd/slow/ConflateCmdStatsTest
-STATS_OUT=test-output/cmd/slow/ConflateCmdStatsTest/generic-rivers-out
+IN_DIR=test-files/cmd/slow/ConflateCmdStatsTest
+OUT_DIR=test-output/cmd/slow/ConflateCmdStatsTest
+mkdir -p $OUT_DIR
+STATS_OUT=$OUT_DIR/generic-rivers-out
 SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
-hoot conflate -C Testing.conf -C UnifyingAlgorithm.conf -C ReferenceConflation.conf -D "match.creators=hoot::ScriptMatchCreator,LinearWaterway.js" -D "merger.creators=hoot::ScriptMergerCreator" -D writer.include.debug.tags=true test-files/conflate/generic/rivers/Haiti_CNIGS_Rivers_REF1-cropped-2.osm test-files/conflate/generic/rivers/Haiti_osm_waterway_ss_REF2-cropped-2.osm $STATS_OUT.osm --stats > $STATS_OUT
+hoot conflate -C Testing.conf -C UnifyingAlgorithm.conf -C ReferenceConflation.conf -D "match.creators=hoot::ScriptMatchCreator,River.js" -D "merger.creators=hoot::ScriptMergerCreator" -D writer.include.debug.tags=true test-files/conflate/generic/rivers/Haiti_CNIGS_Rivers_REF1-cropped-2.osm test-files/conflate/generic/rivers/Haiti_osm_waterway_ss_REF2-cropped-2.osm $STATS_OUT.osm --stats > $STATS_OUT
+
+hoot diff $STATS_OUT.osm $IN_DIR/generic-rivers-out.osm || diff $STATS_OUT.osm $IN_DIR/generic-rivers-out.osm
 
 #read in a set of stat names from a file, delete them from the hoot command stats output, and write the remaining stats to the final output
 EDIT_CMD=""
Clone this wiki locally