summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Anton Lundin <glance@acc.umu.se>2017-02-07 11:57:04 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-02-07 07:48:31 -0800
commit24f61e8b3df1ca7b4c0ff33cb11594f3ac062fad (patch)
tree044e9a53d598795ce20bbc3eca3108f2bc663dd4
parent40620aca0bf7c4e926a4a767fabb8c619fdd32d8 (diff)
downloadsubsurface-24f61e8b3df1ca7b4c0ff33cb11594f3ac062fad.tar.gz
travis: Correct infrastructure for tests on mobile
In the previous code, there was a mistake in how cwd in travis works. This solves that by just using make -C instead. The only issue is that the tests currently fail. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index e6fc92564..8106b8e95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,5 +47,5 @@ script:
- export CMAKE_PREFIX_PATH=$PWD/Qt/5.8/gcc_64/lib/cmake ;
cd .. ;
bash -e ./subsurface/scripts/build.sh -both
- - cd subsurface/build ; env CTEST_OUTPUT_ON_FAILURE=1 make check
-# - cd subsurface/build-mobile ; env CTEST_OUTPUT_ON_FAILURE=1 make check
+ - env CTEST_OUTPUT_ON_FAILURE=1 make -C subsurface/build check
+# - env CTEST_OUTPUT_ON_FAILURE=1 make -C subsurface/build-mobile check