-
Notifications
You must be signed in to change notification settings - Fork 74
v0.2.53..v0.2.54 changeset GGDMv30TranslationTest.sh
Garret Voltz edited this page Mar 31, 2020
·
1 revision
diff --git a/test-files/cmd/slow/GGDMv30TranslationTest.sh b/test-files/cmd/slow/GGDMv30TranslationTest.sh
index ad10eb1..ac4f2f0 100755
--- a/test-files/cmd/slow/GGDMv30TranslationTest.sh
+++ b/test-files/cmd/slow/GGDMv30TranslationTest.sh
@@ -12,7 +12,7 @@ mkdir -p $outputDir
rm -rf $outputDir/*
# Normal Hoot options
-HOOT_OPT="-C Testing.conf --warn"
+HOOT_OPT="--warn -C Testing.conf"
# Hoot options for debugging the test input and output
# NOTE: This will generate HEAPS of output.
@@ -38,7 +38,7 @@ hoot convert $HOOT_OPT -D schema.translation.script=$TRANS $inputDir/*.shp $outp
# Compare the new and old OSM files
# NOTE: ZI031 DATASET_S does not have a UUID (UFI) but it gets one on import which screws up the test
-hoot diff --ignore-uuid $outputDir/new_GGDMv30.osm $inputDir/GGDMv30.osm # || diff $outputDir/new_GGDMv30.osm $inputDir/GGDMv30.osm
+hoot diff $HOOT_OPT --ignore-uuid $outputDir/new_GGDMv30.osm $inputDir/GGDMv30.osm # || diff $outputDir/new_GGDMv30.osm $inputDir/GGDMv30.osm
# Make shapefiles from the new OSM file
# NOTE: This assumes that outputDir does not have any shapefiles in it!
@@ -77,7 +77,6 @@ hoot convert --debug -C Testing.conf -D schema.translation.script=$TRANS $output
# echo
# echo
-
# This is commented out until Jenkins has python-gdal support
#
# Now look at the individual shapefiles