Merge branch 'master' into sf-osrm-routed

scripts/check_taginfo.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 import json
 import sys
@@ -7,7 +7,7 @@ import re
 WHITELIST = set(["mph"])
 
 if len(sys.argv) < 3:
-    print "Not enough arguments.\nUsage: " + sys.argv[0] + " taginfo.json profile.lua"
+    print("Not enough arguments.\nUsage: " + sys.argv[0] + " taginfo.json profile.lua")
     sys.exit(1)
 
 taginfo_path = sys.argv[1]

scripts/ci/leaksanitizer.conf

@@ -6,3 +6,12 @@
 #     #1 0x7f7ae595d13e  (/usr/lib/x86_64-linux-gnu/libtbb.so.2+0x2213e)
 
 leak:libtbb.so
+
+# The extract-tests leak some memory in the tests to confirm that
+# lua errors print tracebacks.
+# This appears to be because when these tests throw exceptions, the
+# osmium objects being processed are not freed. In production this doesn't
+# matter, as the exceptions bring down the entire osrm-extract process. In the
+# tests, we catch the error to make sure it occurs, which is why the
+# leaksanitizer flags it.
+leak:extract-tests

scripts/cucumber_test_matrix.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o pipefail
+set -o nounset
+
+loadmethods=(datastore mmap directly)
+profiles=(ch mld)
+
+for profile in "${profiles[@]}"
+do
+  for loadmethod in "${loadmethods[@]}"
+  do
+    set -x
+    node ./node_modules/cucumber/bin/cucumber.js features/ -p $profile -m $loadmethod
+    { set +x; } 2>/dev/null
+  done
+done
+
+# we do not run `osrm-routed-js` tests on v12 since fastify doesn't support it
+NODE_VERSION=$(node --version)
+NODE_MAJOR_VERSION=$(echo $NODE_VERSION | cut -d. -f1)
+if [[ "$NODE_MAJOR_VERSION" != "v12" ]]; then
+    echo "Running osrm-routed-js tests"
+
+    export OSRM_USE_ROUTED_JS=1
+    node ./node_modules/cucumber/bin/cucumber.js features/ -p verify_routed_js
+    node ./node_modules/cucumber/bin/cucumber.js features/ -p mld_routed_js
+    unset OSRM_USE_ROUTED_JS
+else 
+    echo "Skipping osrm-routed-js tests on Node.js ${NODE_VERSION}"
+fi