Merge branch 'master' of https://github.com/DennisOSRM/Project-OSRM

features/support/hash.rb

@@ -31,8 +31,12 @@ def bin_prepare_hash
   @bin_hash ||= hash_of_file '../osrm-prepare'
 end
 
-#combine state of data, speedprofile and binaries into a hash that identifies the exact test scenario
+def bin_routed_hash
-def fingerprint
+  @bin_hash ||= hash_of_file '../osrm-routed'
-  @fingerprint ||= Digest::SHA1.hexdigest "#{bin_extract_hash}-#{bin_prepare_hash}-#{speedprofile_hash}-#{osm_hash}"
+end
+
+#combine state of data, speedprofile and binaries into a hash that identifies the exact test scenario
+def fingerprint
+  @fingerprint ||= Digest::SHA1.hexdigest "#{bin_extract_hash}-#{bin_prepare_hash}-#{bin_routed_hash}-#{speedprofile_hash}-#{osm_hash}"
 end
 

test/contractor.ini

@@ -0,0 +1 @@
+Threads = 4

test/extractor.ini

@@ -0,0 +1 @@
+Memory = 1