Skip to content

v0.2.53..v0.2.54 changeset NetworkConflateCmdRelationEdgeTest.sh

Garret Voltz edited this page Mar 31, 2020 · 1 revision
diff --git a/test-files/cmd/slow/NetworkConflateCmdRelationEdgeTest.sh b/test-files/cmd/slow/NetworkConflateCmdRelationEdgeTest.sh
index dee32b3..f40aa51 100755
--- a/test-files/cmd/slow/NetworkConflateCmdRelationEdgeTest.sh
+++ b/test-files/cmd/slow/NetworkConflateCmdRelationEdgeTest.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -e
 
+# Note: The missing element to merge warning generated by this test should be looked into at some point. Not critical right now.
+
 INPUT_DIR=test-files/cmd/slow/NetworkConflateCmdRelationEdgeTest
 OUTPUT_DIR=test-output/cmd/slow/NetworkConflateCmdRelationEdgeTest
 rm -rf $OUTPUT_DIR
@@ -9,4 +11,4 @@ mkdir -p $OUTPUT_DIR
 # The purpose of this test is to catch make sure we're preventing an error when the Network Roads Alg tries to calculate a heading at a vertex
 # with a relation as the network edge input. It should skip it unless the edge is a way.
 hoot conflate --warn -C DifferentialConflation.conf -C NetworkAlgorithm.conf -C Testing.conf $INPUT_DIR/input1.osm $INPUT_DIR/input2.osm $OUTPUT_DIR/out.osm
-hoot diff $INPUT_DIR/out.osm $OUTPUT_DIR/out.osm || diff $INPUT_DIR/out.osm $OUTPUT_DIR/out.osm
+hoot diff -C Testing.conf $INPUT_DIR/out.osm $OUTPUT_DIR/out.osm || diff $INPUT_DIR/out.osm $OUTPUT_DIR/out.osm
Clone this wiki locally