Skip to content

Commit a35b592

Browse files
save
1 parent 6149330 commit a35b592

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

features/support/env.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ module.exports = function () {
1515
this.setDefaultTimeout(this.TIMEOUT);
1616
this.ROOT_PATH = process.cwd();
1717

18+
this.USE_ROUTED_JS = process.env.OSRM_USE_ROUTED_JS || false;
19+
1820
this.TEST_PATH = path.resolve(this.ROOT_PATH, 'test');
1921
this.CACHE_PATH = path.resolve(this.TEST_PATH, 'cache');
2022
this.LOGS_PATH = path.resolve(this.TEST_PATH, 'logs');

features/support/run.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ module.exports = function () {
3939

4040
this.runBin = (bin, options, env, callback) => {
4141
let cmd = path.resolve(util.format('%s/%s%s', this.BIN_PATH, bin, this.EXE));
42-
if (bin === 'osrm-routed') {
43-
cmd = 'osrm-routed-js';//path.resolve(util.format('%s/../server/server.js', this.BIN_PATH));
42+
if (this.USE_ROUTED_JS && bin === 'osrm-routed') {
43+
cmd = 'osrm-routed-js';
4444
}
4545
let opts = options.split(' ').filter((x) => { return x && x.length > 0; });
4646

features/testbot/trip.feature

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ Feature: Basic trip planning
44
Background:
55
Given the profile "testbot"
66
Given a grid size of 10 meters
7-
7+
8+
@skip_on_routed_js
89
Scenario: Testbot - Trip: Invalid options (like was in test suite for a long time)
910
Given the node map
1011
"""

scripts/run_cucumber_tests.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
#!/bin/sh
22
set -eou pipefail
3+
export OSRM_USE_ROUTED_JS=1
34
node ./node_modules/cucumber/bin/cucumber.js features/ -p verify_routed_js
4-
# node ./node_modules/cucumber/bin/cucumber.js features/ -p verify -m mmap
5-
# node ./node_modules/cucumber/bin/cucumber.js features/ -p mld
6-
# node ./node_modules/cucumber/bin/cucumber.js features/ -p mld -m mmap
5+
# node ./node_modules/cucumber/bin/cucumber.js features/ -p verify_routed_js -m mmap
6+
# node ./node_modules/cucumber/bin/cucumber.js features/ -p mld_routed_js
7+
# node ./node_modules/cucumber/bin/cucumber.js features/ -p mld_routed_js -m mmap
8+
unset OSRM_USE_ROUTED_JS
79

810
# node ./node_modules/cucumber/bin/cucumber.js features/ -p verify
911
# node ./node_modules/cucumber/bin/cucumber.js features/ -p verify -m mmap

0 commit comments

Comments
 (0)