rebase branch onto develop

This commit is contained in:
Dennis Luxen
2014-04-24 18:13:50 +02:00
parent ace59411cb
commit 0eed39cdf1
8 changed files with 51 additions and 156 deletions
+4 -4
View File
@@ -25,7 +25,7 @@ Feature: osrm-routed command line options: help
And stdout should contain "--port"
And stdout should contain "--threads"
And stdout should contain "--sharedmemory"
And stdout should contain 21 lines
And stdout should contain 22 lines
And it should exit with code 0
Scenario: osrm-routed - Help, short
@@ -49,7 +49,7 @@ Feature: osrm-routed command line options: help
And stdout should contain "--port"
And stdout should contain "--threads"
And stdout should contain "--sharedmemory"
And stdout should contain 21 lines
And stdout should contain 22 lines
And it should exit with code 0
Scenario: osrm-routed - Help, long
@@ -73,5 +73,5 @@ Feature: osrm-routed command line options: help
And stdout should contain "--port"
And stdout should contain "--threads"
And stdout should contain "--sharedmemory"
And stdout should contain 21 lines
And it should exit with code 0
And stdout should contain 22 lines
And it should exit with code 0