diff --git a/test/data/Makefile b/test/data/Makefile index da3c5f3ca..31f4b0fc5 100755 --- a/test/data/Makefile +++ b/test/data/Makefile @@ -35,21 +35,21 @@ $(DATA_NAME)_%.osrm: $(DATA_NAME)_%.osm.pbf $(DATA_NAME).poly $(PROFILE) $(OSRM_ @echo "Verifiyng data file integrity..." $(MD5SUM) -c data.md5sum @echo "Running osrm-extract..." - $(TIMER) "osrm-extract" $(OSRM_EXTRACT) $< -p $(PROFILE) + $(TIMER) "osrm-extract\t$@" $(OSRM_EXTRACT) $< -p $(PROFILE) $(DATA_NAME)_CH.osrm.hsgr: $(DATA_NAME)_CH.osrm $(PROFILE) $(OSRM_CONTRACT) @echo "Running osrm-contract..." - $(TIMER) "osrm-contract" $(OSRM_CONTRACT) $< + $(TIMER) "osrm-contract\t$@" $(OSRM_CONTRACT) $< $(DATA_NAME)_CoreCH.osrm.hsgr: $(DATA_NAME)_CoreCH.osrm $(PROFILE) $(OSRM_CONTRACT) @echo "Running osrm-contract..." - $(TIMER) "osrm-contract" $(OSRM_CONTRACT) --core=0.95 $< + $(TIMER) "osrm-contract\t$@" $(OSRM_CONTRACT) --core=0.95 $< $(DATA_NAME)_MLD.osrm.partition: $(DATA_NAME)_MLD.osrm $(PROFILE) $(OSRM_PARTITION) @echo "Running osrm-partition..." - $(TIMER) "osrm-contract" $(OSRM_CONTRACT) $< - $(TIMER) "osrm-partition" $(OSRM_PARTITION) $< - $(TIMER) "osrm-customize" $(OSRM_CUSTOMIZE) $< + $(TIMER) "osrm-contract\t$@" $(OSRM_CONTRACT) $< + $(TIMER) "osrm-partition\t$@" $(OSRM_PARTITION) $< + $(TIMER) "osrm-customize\t$@" $(OSRM_CUSTOMIZE) $< $(DATA_NAME).requests: $(DATA_NAME).poly $(POLY2REQ) $(DATA_NAME).poly > $(DATA_NAME).requests @@ -58,17 +58,17 @@ benchmark: data $(DATA_NAME).requests @echo "Running benchmark..." @/bin/sh -c '$(OSRM_ROUTED) --algorithm=CH $(DATA_NAME)_CH.osrm > /dev/null & echo "$$!" > osrm-routed.pid' @sleep 1 - $(TIMER) "queries" "cat $(DATA_NAME).requests | xargs curl &> /dev/null" + $(TIMER) "queries\tCH" "cat $(DATA_NAME).requests | xargs curl &> /dev/null" @cat osrm-routed.pid | xargs kill @rm osrm-routed.pid @/bin/sh -c '$(OSRM_ROUTED) --algorithm=CoreCH $(DATA_NAME)_CoreCH.osrm > /dev/null & echo "$$!" > osrm-routed.pid' @sleep 1 - $(TIMER) "queries" "cat $(DATA_NAME).requests | xargs curl &> /dev/null" + $(TIMER) "queries\tCoreCH" "cat $(DATA_NAME).requests | xargs curl &> /dev/null" @cat osrm-routed.pid | xargs kill @rm osrm-routed.pid @/bin/sh -c '$(OSRM_ROUTED) --algorithm=MLD $(DATA_NAME)_MLD.osrm > /dev/null & echo "$$!" > osrm-routed.pid' @sleep 1 - $(TIMER) "queries" "cat $(DATA_NAME).requests | xargs curl &> /dev/null" + $(TIMER) "queries\tMLD" "cat $(DATA_NAME).requests | xargs curl &> /dev/null" @cat osrm-routed.pid | xargs kill @rm osrm-routed.pid @echo "**** timings ***"