Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

make cuke use bins in build/

Browse Source
This commit is contained in:
Emil Tin 2013-04-26 10:22:23 +02:00
parent dad4981a57
commit 36f3c0f77a
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
features/support/data.rb
View File

@ -14,6 +14,7 @@ DEFAULT_SPEEDPROFILE = 'bicycle'
WAY_SPACING = 100 WAY_SPACING = 100
DEFAULT_GRID_SIZE = 100 #meters DEFAULT_GRID_SIZE = 100 #meters
PROFILES_PATH = '../profiles' PROFILES_PATH = '../profiles'
BIN_PATH = '../build'
ORIGIN = [1,1] ORIGIN = [1,1]
@ -249,7 +250,7 @@ def reprocess
unless extracted? unless extracted?
log_preprocess_info log_preprocess_info
log "== Extracting #{@osm_file}.osm...", :preprocess log "== Extracting #{@osm_file}.osm...", :preprocess
unless system "../osrm-extract #{@osm_file}.osm#{'.pbf' if use_pbf} 1>>#{PREPROCESS_LOG_FILE} 2>>#{PREPROCESS_LOG_FILE} #{PROFILES_PATH}/#{@profile}.lua" unless system "#{BIN_PATH}/osrm-extract #{@osm_file}.osm#{'.pbf' if use_pbf} 1>>#{PREPROCESS_LOG_FILE} 2>>#{PREPROCESS_LOG_FILE} #{PROFILES_PATH}/#{@profile}.lua"
log "*** Exited with code #{$?.exitstatus}.", :preprocess log "*** Exited with code #{$?.exitstatus}.", :preprocess
raise ExtractError.new $?.exitstatus, "osrm-extract exited with code #{$?.exitstatus}." raise ExtractError.new $?.exitstatus, "osrm-extract exited with code #{$?.exitstatus}."
end end
@ -258,7 +259,7 @@ def reprocess
unless prepared? unless prepared?
log_preprocess_info log_preprocess_info
log "== Preparing #{@osm_file}.osm...", :preprocess log "== Preparing #{@osm_file}.osm...", :preprocess
unless system "../osrm-prepare #{@osm_file}.osrm #{@osm_file}.osrm.restrictions 1>>#{PREPROCESS_LOG_FILE} 2>>#{PREPROCESS_LOG_FILE} #{PROFILES_PATH}/#{@profile}.lua" unless system "#{BIN_PATH}/osrm-prepare #{@osm_file}.osrm #{@osm_file}.osrm.restrictions 1>>#{PREPROCESS_LOG_FILE} 2>>#{PREPROCESS_LOG_FILE} #{PROFILES_PATH}/#{@profile}.lua"
log "*** Exited with code #{$?.exitstatus}.", :preprocess log "*** Exited with code #{$?.exitstatus}.", :preprocess
raise PrepareError.new $?.exitstatus, "osrm-prepare exited with code #{$?.exitstatus}." raise PrepareError.new $?.exitstatus, "osrm-prepare exited with code #{$?.exitstatus}."
end end

6
features/support/hash.rb
View File

@ -29,15 +29,15 @@ def lua_lib_hash
end end
def bin_extract_hash def bin_extract_hash
@@bin_extract_hash ||= hash_of_files '../osrm-extract' @@bin_extract_hash ||= hash_of_files "#{BIN_PATH}/osrm-extract"
end end
def bin_prepare_hash def bin_prepare_hash
@@bin_prepare_hash ||= hash_of_files '../osrm-prepare' @@bin_prepare_hash ||= hash_of_files "#{BIN_PATH}/osrm-prepare"
end end
def bin_routed_hash def bin_routed_hash
@@bin_routed_hash ||= hash_of_files '../osrm-routed' @@bin_routed_hash ||= hash_of_files "#{BIN_PATH}/osrm-routed"
end end
#combine state of data, profile and binaries into a hash that identifies the exact test scenario #combine state of data, profile and binaries into a hash that identifies the exact test scenario

2
features/support/launch.rb
View File

@ -48,7 +48,7 @@ class OSRMLauncher
def osrm_up def osrm_up
return if osrm_up? return if osrm_up?
@pid = Process.spawn(['../osrm-routed',''],:out=>OSRM_ROUTED_LOG_FILE, :err=>OSRM_ROUTED_LOG_FILE) @pid = Process.spawn(["#{BIN_PATH}/osrm-routed",''],:out=>OSRM_ROUTED_LOG_FILE, :err=>OSRM_ROUTED_LOG_FILE)
end end
def osrm_down def osrm_down