From 36ab848aba41560182bedd0b27b5b2a98cc6fddb Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Mon, 6 Mar 2017 01:17:05 +0000 Subject: [PATCH] Fix travis --- .travis.yml | 2 +- test/data/Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 062284b6a..7b7aa93b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -196,7 +196,7 @@ install: script: - if [[ $TARGET_ARCH == armhf ]] ; then echo "Skip tests for $TARGET_ARCH" && exit 0 ; fi - make -C test/data benchmark - - ./example/build/osrm-example test/data/monaco.osrm + - ./example/build/osrm-example test/data/monaco_CH.osrm # All tests assume to be run from the build directory - pushd ${OSRM_BUILD_DIR} - ./unit_tests/library-tests diff --git a/test/data/Makefile b/test/data/Makefile index d078fc562..dd35dfead 100755 --- a/test/data/Makefile +++ b/test/data/Makefile @@ -54,17 +54,17 @@ $(DATA_NAME).requests: $(DATA_NAME).poly benchmark: data $(DATA_NAME).requests @echo "Running benchmark..." - @/bin/sh -c '$(OSRM_ROUTED) --algorithm=CH $(DATA_NAME)_CH.osrm& echo "$$!" > osrm-routed.pid' + @/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" @cat osrm-routed.pid | xargs kill @rm osrm-routed.pid - @/bin/sh -c '$(OSRM_ROUTED) --algorithm=CoreCH $(DATA_NAME)_CoreCH.osrm& echo "$$!" > 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" @cat osrm-routed.pid | xargs kill @rm osrm-routed.pid - @/bin/sh -c '$(OSRM_ROUTED) --algorithm=MLD $(DATA_NAME)_MLD.osrm& echo "$$!" > 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" @cat osrm-routed.pid | xargs kill @@ -76,4 +76,4 @@ benchmark: data $(DATA_NAME).requests checksum: $(MD5SUM) $(DATA_NAME).osm.pbf $(DATA_NAME).poly > data.md5sum -.PHONY: clean checksum benchmark +.PHONY: clean checksum benchmark data