-
Notifications
You must be signed in to change notification settings - Fork 74
v0.2.53..v0.2.54 changeset ConflateCmdStatsGenericRiversTest.sh
Garret Voltz edited this page Mar 31, 2020
·
1 revision
diff --git a/test-files/cmd/slow/ConflateCmdStatsGenericRiversTest.sh b/test-files/cmd/slow/ConflateCmdStatsGenericRiversTest.sh
index e2f3de0..963cbc7 100755
--- a/test-files/cmd/slow/ConflateCmdStatsGenericRiversTest.sh
+++ b/test-files/cmd/slow/ConflateCmdStatsGenericRiversTest.sh
@@ -7,9 +7,11 @@ 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,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
+CONFIG="-C Testing.conf"
-hoot diff $STATS_OUT.osm $IN_DIR/generic-rivers-out.osm || diff $STATS_OUT.osm $IN_DIR/generic-rivers-out.osm
+hoot conflate $CONFIG -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 $CONFIG $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=""
@@ -21,3 +23,5 @@ do
done < $SCRIPT_DIR/ConflateCmdStatsTest.conf
EDIT_CMD="sed "$EDIT_CMD" "$STATS_OUT" | sed -n -e '/stats =/,\$p'"
eval $EDIT_CMD
+
+#