Skip to content

v0.2.53..v0.2.54 changeset SortCmdTest.sh

Garret Voltz edited this page Mar 31, 2020 · 1 revision
diff --git a/test-files/cmd/slow/SortCmdTest.sh b/test-files/cmd/slow/SortCmdTest.sh
index c2d95a3..df4c727 100755
--- a/test-files/cmd/slow/SortCmdTest.sh
+++ b/test-files/cmd/slow/SortCmdTest.sh
@@ -7,32 +7,34 @@ mkdir -p $OUTPUT_DIR
 
 BUFFER_SIZE=3
 
-#There is no geonames writer, so we're writing that input to osm xml.
+CONFIG="-C Testing.conf"
+
+# There is no geonames writer, so we're writing that input to osm xml.
 
 # in memory sorting tests
 
 echo "Sorting geonames in memory..."
 echo ""
-hoot is-sorted $INPUT_DIR/input.geonames
-hoot sort --warn $INPUT_DIR/input.geonames $OUTPUT_DIR/geonames-output-1.osm
-hoot is-sorted $OUTPUT_DIR/geonames-output-1.osm
-hoot diff --warn $INPUT_DIR/geonames-output.osm $OUTPUT_DIR/geonames-output-1.osm
+hoot is-sorted $CONFIG $INPUT_DIR/input.geonames
+hoot sort --warn $CONFIG $INPUT_DIR/input.geonames $OUTPUT_DIR/geonames-output-1.osm
+hoot is-sorted $CONFIG $OUTPUT_DIR/geonames-output-1.osm
+hoot diff --warn $CONFIG $INPUT_DIR/geonames-output.osm $OUTPUT_DIR/geonames-output-1.osm
 echo ""
 
 echo "Sorting xml in memory..."
 echo ""
-hoot is-sorted $INPUT_DIR/input.osm
-hoot sort --warn $INPUT_DIR/input.osm $OUTPUT_DIR/osm-output-1.osm
-hoot is-sorted $OUTPUT_DIR/osm-output-1.osm
-hoot diff --warn $INPUT_DIR/osm-output.osm $OUTPUT_DIR/osm-output-1.osm
+hoot is-sorted $CONFIG $INPUT_DIR/input.osm
+hoot sort --warn $CONFIG $INPUT_DIR/input.osm $OUTPUT_DIR/osm-output-1.osm
+hoot is-sorted $CONFIG $OUTPUT_DIR/osm-output-1.osm
+hoot diff --warn $CONFIG $INPUT_DIR/osm-output.osm $OUTPUT_DIR/osm-output-1.osm
 echo ""
 
 echo "Sorting pbf in memory..."
 echo ""
-hoot is-sorted $INPUT_DIR/input.osm.pbf
-hoot sort --warn $INPUT_DIR/input.osm.pbf $OUTPUT_DIR/pbf-output-1.osm.pbf
-hoot is-sorted $OUTPUT_DIR/pbf-output-1.osm.pbf
-hoot diff --warn $INPUT_DIR/pbf-output.osm.pbf $OUTPUT_DIR/pbf-output-1.osm.pbf
+hoot is-sorted $CONFIG $INPUT_DIR/input.osm.pbf
+hoot sort --warn $CONFIG $INPUT_DIR/input.osm.pbf $OUTPUT_DIR/pbf-output-1.osm.pbf
+hoot is-sorted $CONFIG $OUTPUT_DIR/pbf-output-1.osm.pbf
+hoot diff --warn $CONFIG $INPUT_DIR/pbf-output.osm.pbf $OUTPUT_DIR/pbf-output-1.osm.pbf
 echo ""
 
 # external merge sorting tests
@@ -42,24 +44,24 @@ echo ""
 
 echo "Sorting geonames on disk..."
 echo ""
-hoot is-sorted $INPUT_DIR/input.geonames
-hoot sort --warn -D element.sorter.element.buffer.size=$BUFFER_SIZE $INPUT_DIR/input.geonames $OUTPUT_DIR/geonames-output-2.osm
-hoot is-sorted $OUTPUT_DIR/geonames-output-2.osm
-hoot diff --warn $INPUT_DIR/geonames-output.osm $OUTPUT_DIR/geonames-output-2.osm
+hoot is-sorted $CONFIG $INPUT_DIR/input.geonames
+hoot sort --warn $CONFIG -D element.sorter.element.buffer.size=$BUFFER_SIZE $INPUT_DIR/input.geonames $OUTPUT_DIR/geonames-output-2.osm
+hoot is-sorted $CONFIG $OUTPUT_DIR/geonames-output-2.osm
+hoot diff --warn $CONFIG $INPUT_DIR/geonames-output.osm $OUTPUT_DIR/geonames-output-2.osm
 echo ""
 
 echo "Sorting xml on disk..."
 echo ""
-hoot is-sorted $INPUT_DIR/input.osm
-hoot sort --warn -D element.sorter.element.buffer.size=$BUFFER_SIZE $INPUT_DIR/input.osm $OUTPUT_DIR/osm-output-2.osm
-hoot is-sorted $OUTPUT_DIR/osm-output-2.osm
-hoot diff --warn $INPUT_DIR/osm-output.osm $OUTPUT_DIR/osm-output-2.osm
+hoot is-sorted $CONFIG $INPUT_DIR/input.osm
+hoot sort --warn $CONFIG -D element.sorter.element.buffer.size=$BUFFER_SIZE $INPUT_DIR/input.osm $OUTPUT_DIR/osm-output-2.osm
+hoot is-sorted $CONFIG $OUTPUT_DIR/osm-output-2.osm
+hoot diff --warn $CONFIG $INPUT_DIR/osm-output.osm $OUTPUT_DIR/osm-output-2.osm
 echo ""
 
 echo "Sorting pbf on disk..."
 echo ""
-hoot is-sorted $INPUT_DIR/input.osm.pbf
-hoot sort --warn -D element.sorter.element.buffer.size=$BUFFER_SIZE $INPUT_DIR/input.osm.pbf $OUTPUT_DIR/pbf-output-2.osm.pbf
-hoot is-sorted $OUTPUT_DIR/pbf-output-2.osm.pbf
-hoot diff --warn $INPUT_DIR/pbf-output.osm.pbf $OUTPUT_DIR/pbf-output-2.osm.pbf
+hoot is-sorted $CONFIG $INPUT_DIR/input.osm.pbf
+hoot sort --warn $CONFIG -D element.sorter.element.buffer.size=$BUFFER_SIZE $INPUT_DIR/input.osm.pbf $OUTPUT_DIR/pbf-output-2.osm.pbf
+hoot is-sorted $CONFIG $OUTPUT_DIR/pbf-output-2.osm.pbf
+hoot diff --warn $CONFIG $INPUT_DIR/pbf-output.osm.pbf $OUTPUT_DIR/pbf-output-2.osm.pbf
 echo ""
Clone this wiki locally