diff --git a/.travis.yml b/.travis.yml index 5fadfeec..335a350d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,14 +7,14 @@ matrix: compiler: clang script: - python test/run.py - - make ws + - make ws_test # Linux - os: linux dist: xenial script: - python test/run.py - - make ws + - make ws_test env: - CC=gcc - CXX=g++ diff --git a/makefile b/makefile index 8d5f15c4..310f13ab 100644 --- a/makefile +++ b/makefile @@ -52,7 +52,7 @@ test: python2.7 test/run.py ws_test: all - (cd ws ; bash test_ws.sh) + (cd ws ; env DEBUG=1 PATH=../ws/build:$$PATH bash test_ws.sh) # For the fork that is configured with appveyor rebase_upstream: @@ -67,3 +67,4 @@ install_cmake_for_linux: .PHONY: test .PHONY: build +.PHONY: ws diff --git a/ws/test_ws.sh b/ws/test_ws.sh index 587fd332..f2e94aa1 100644 --- a/ws/test_ws.sh +++ b/ws/test_ws.sh @@ -61,4 +61,4 @@ sleep 2 kill `cat /tmp/ws_test/pidfile.transfer` kill `cat /tmp/ws_test/pidfile.receive` kill `cat /tmp/ws_test/pidfile.send` - +exit 0