Travis: run "make check" only once with DO_COVERAGE=true (#940)

Fixes https://github.com/awesomeWM/awesome/issues/938.
This commit is contained in:
Daniel Hahler 2016-06-05 16:12:57 +02:00
parent 7830cf076b
commit 547fec2824
1 changed files with 7 additions and 3 deletions

View File

@ -99,12 +99,16 @@ script:
cd "$BUILD_IN_DIR" cd "$BUILD_IN_DIR"
cmake $CMAKE_ARGS "$SOURCE_DIRECTORY" cmake $CMAKE_ARGS "$SOURCE_DIRECTORY"
fi fi
- make && sudo env PATH=$PATH make install && awesome --version && make check - make && sudo env PATH=$PATH make install && awesome --version
- | - |
if [ "$TRAVIS_TEST_RESULT" = 0 ]; then
if [ "$DO_COVERAGE" = "true" ]; then if [ "$DO_COVERAGE" = "true" ]; then
make check-coverage || exit 1; make check-coverage || exit 1
sed -i "1 i\\require('luacov.runner')('"$PWD"/.luacov')" build/awesomerc.lua || exit 1 sed -i "1 i\\require('luacov.runner')('"$PWD"/.luacov')" build/awesomerc.lua || exit 1
BUILD_DIRECTORY="" tests/run.sh || exit 1 BUILD_DIRECTORY="" tests/run.sh || exit 1
else
make check
fi
fi fi
after_success: after_success: