implements #958

features/options/files.feature

@@ -3,10 +3,10 @@ Feature: Command line options: files
     Normally when launching osrm-routed, it will keep running as a server until it's shut down.
     For testing program options, the --trial option is used, which causes osrm-routed to quit
     immediately after initialization. This makes testing easier and faster.
-    
+
     The {base} part of the options to osrm-routed will be expanded to the actual base path of
     the preprocessed file.
-    
+
     Background:
         Given the profile "testbot"
         And the node map
@@ -15,13 +15,13 @@ Feature: Command line options: files
             | nodes |
             | ab    |
         And I preprocess data
-        
+
     Scenario: Passing base file
         When I run "osrm-routed {base}.osrm --trial"
         Then stdout should contain /^\[info\] starting up engines/
         And stdout should contain /\d{1,2}\.\d{1,2}\.\d{1,2}/
         And stdout should contain /compiled at/
         And stdout should contain /^\[info\] loaded plugin: viaroute/
-        And stdout should contain /^\[server\] trial run/
-        And stdout should contain /^\[server\] shutdown completed/
-        And it should exit with code 0
+        And stdout should contain /^\[info\] trial run/
+        And stdout should contain /^\[info\] shutdown completed/
+        And it should exit with code 0

features/options/help.feature

@@ -31,4 +31,4 @@ Feature: Command line options: help
         | program_options |
         |                 |
         | -h              |
-        | --help          |
+        | --help          |

features/options/invalid.feature

@@ -9,11 +9,11 @@ Feature: Command line options: invalid options
         Then stdout should be empty
         And stderr should contain "exception"
         And stderr should contain "fly-me-to-the-moon"
-        And it should exit with code 255
+        And it should exit with code 1
 
     Scenario: Missing file
         When I run "osrm-routed over-the-rainbow.osrm"
         Then stdout should contain "over-the-rainbow.osrm"
         And stderr should contain "exception"
         And stderr should contain "does not exist"
-        And it should exit with code 255
+        And it should exit with code 1