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

Fix travis

Browse Source
This commit is contained in:
Patrick Niklaus 2017-03-06 01:17:05 +00:00 committed by Patrick Niklaus
parent 6cb401b1ff
commit 36ab848aba
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -196,7 +196,7 @@ install:
script: script:
- if [[ $TARGET_ARCH == armhf ]] ; then echo "Skip tests for $TARGET_ARCH" && exit 0 ; fi - if [[ $TARGET_ARCH == armhf ]] ; then echo "Skip tests for $TARGET_ARCH" && exit 0 ; fi
- make -C test/data benchmark - 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 # All tests assume to be run from the build directory
- pushd ${OSRM_BUILD_DIR} - pushd ${OSRM_BUILD_DIR}
- ./unit_tests/library-tests - ./unit_tests/library-tests

8
test/data/Makefile
View File

@ -54,17 +54,17 @@ $(DATA_NAME).requests: $(DATA_NAME).poly
benchmark: data $(DATA_NAME).requests benchmark: data $(DATA_NAME).requests
@echo "Running benchmark..." @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 @sleep 1
$(TIMER) "queries" "cat $(DATA_NAME).requests | xargs curl &> /dev/null" $(TIMER) "queries" "cat $(DATA_NAME).requests | xargs curl &> /dev/null"
@cat osrm-routed.pid | xargs kill @cat osrm-routed.pid | xargs kill
@rm osrm-routed.pid @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 @sleep 1
$(TIMER) "queries" "cat $(DATA_NAME).requests | xargs curl &> /dev/null" $(TIMER) "queries" "cat $(DATA_NAME).requests | xargs curl &> /dev/null"
@cat osrm-routed.pid | xargs kill @cat osrm-routed.pid | xargs kill
@rm osrm-routed.pid @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 @sleep 1
$(TIMER) "queries" "cat $(DATA_NAME).requests | xargs curl &> /dev/null" $(TIMER) "queries" "cat $(DATA_NAME).requests | xargs curl &> /dev/null"
@cat osrm-routed.pid | xargs kill @cat osrm-routed.pid | xargs kill
@ -76,4 +76,4 @@ benchmark: data $(DATA_NAME).requests
checksum: checksum:
$(MD5SUM) $(DATA_NAME).osm.pbf $(DATA_NAME).poly > data.md5sum $(MD5SUM) $(DATA_NAME).osm.pbf $(DATA_NAME).poly > data.md5sum
.PHONY: clean checksum benchmark .PHONY: clean checksum benchmark data