osrm-prepare -> osrm-contract

features/support/data.rb

@@ -277,9 +277,9 @@ def prepare_data
   Dir.chdir TEST_FOLDER do
     log_preprocess_info
     log "== Preparing #{extracted_file}.osm...", :preprocess
-    unless system "#{LOAD_LIBRARIES}#{BIN_PATH}/osrm-prepare #{extracted_file}.osrm  --profile #{PROFILES_PATH}/#{@profile}.lua >>#{PREPROCESS_LOG_FILE} 2>&1"
+    unless system "#{LOAD_LIBRARIES}#{BIN_PATH}/osrm-contract #{extracted_file}.osrm  >>#{PREPROCESS_LOG_FILE} 2>&1"
       log "*** Exited with code #{$?.exitstatus}.", :preprocess
-      raise PrepareError.new $?.exitstatus, "osrm-prepare exited with code #{$?.exitstatus}."
+      raise PrepareError.new $?.exitstatus, "osrm-contract exited with code #{$?.exitstatus}."
     end
     begin
       ["osrm.hsgr","osrm.fileIndex","osrm.geometry","osrm.nodes","osrm.ramIndex","osrm.core","osrm.edges"].each do |file|

features/support/env.rb

@@ -81,7 +81,7 @@ def verify_osrm_is_not_running
 end
 
 def verify_existance_of_binaries
-  ["osrm-extract", "osrm-prepare", "osrm-routed"].each do |bin|
+  ["osrm-extract", "osrm-contract", "osrm-routed"].each do |bin|
     unless File.exists? "#{BIN_PATH}/#{bin}#{EXE}"
       raise "*** #{BIN_PATH}/#{bin}#{EXE} is missing. Build failed?"
     end

features/support/exceptions.rb

@@ -45,7 +45,7 @@ end
 
 class PrepareError < OSRMError
   def initialize code, msg
-    super 'osrm-prepare', code, msg, PREPROCESS_LOG_FILE, 3
+    super 'osrm-contract', code, msg, PREPROCESS_LOG_FILE, 3
   end
 end
 

features/support/hash.rb

@@ -37,7 +37,7 @@ def bin_extract_hash
 end
 
 def bin_prepare_hash
-  @bin_prepare_hash ||= hash_of_files "#{BIN_PATH}/osrm-prepare#{EXE}"
+  @bin_prepare_hash ||= hash_of_files "#{BIN_PATH}/osrm-contract#{EXE}"
 end
 
 def bin_routed_hash

features/support/run.rb

@@ -25,4 +25,4 @@ def run_bin bin, options
     @stderr = File.read 'error.log'
     @exit_code = $?.exitstatus
   end
-end
+end