v0.2.53..v0.2.54 changeset ConflateCmdStatsAllDataTypesTest.sh
Garret Voltz edited this page Mar 31, 2020
·
1 revision
diff --git a/test-files/cmd/slow/ConflateCmdStatsAllDataTypesTest.sh b/test-files/cmd/slow/ConflateCmdStatsAllDataTypesTest.sh
index 814c146..8618181 100755
--- a/test-files/cmd/slow/ConflateCmdStatsAllDataTypesTest.sh
+++ b/test-files/cmd/slow/ConflateCmdStatsAllDataTypesTest.sh
@@ -7,9 +7,11 @@ mkdir -p $OUT_DIR
STATS_OUT=$OUT_DIR/all-data-types-out
SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-hoot conflate -C Testing.conf -C UnifyingAlgorithm.conf -C ReferenceConflation.conf -D writer.include.debug.tags=true test-files/conflate/unified/AllDataTypesA.osm test-files/conflate/unified/AllDataTypesB.osm $STATS_OUT.osm --stats > $STATS_OUT
+CONFIG="-C Testing.conf"
-hoot diff $STATS_OUT.osm $IN_DIR/all-data-types-out.osm || diff $STATS_OUT.osm $IN_DIR/all-data-types-out.osm
+hoot conflate $CONFIG -C UnifyingAlgorithm.conf -C ReferenceConflation.conf -D writer.include.debug.tags=true test-files/conflate/unified/AllDataTypesA.osm test-files/conflate/unified/AllDataTypesB.osm $STATS_OUT.osm --stats > $STATS_OUT
+
+hoot diff $CONFIG $STATS_OUT.osm $IN_DIR/all-data-types-out.osm || diff $STATS_OUT.osm $IN_DIR/all-data-types-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=""