From daf1a84de39c4cdbd308c6a0b80b437689a222c7 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Sun, 2 Jun 2019 10:28:53 +0200 Subject: .travis.yml: Use meson for building --- .travis/linux/after_success.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to '.travis/linux/after_success.sh') diff --git a/.travis/linux/after_success.sh b/.travis/linux/after_success.sh index 6c648a2..ff3d31c 100644 --- a/.travis/linux/after_success.sh +++ b/.travis/linux/after_success.sh @@ -1,13 +1,11 @@ #!/bin/sh -if test x"$COVERAGE" = xyes; then - # docker exec $CONTAINER pip install cpp-coveralls +set +x - # manually install cpp-coveralls until the gcov fix has been - # incorporated in the pip version - docker exec $CONTAINER sh -c "cd /tmp && rm -rf cpp-coveralls && git clone -q https://github.com/eddyxu/cpp-coveralls && cd cpp-coveralls && python setup.py build && python setup.py install" +if test x"$COVERAGE" = xyes; then + docker exec $CONTAINER su user sh -c "pip3 install --user cpp-coveralls" docker exec \ -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" \ -e TRAVIS_BRANCH="$TRAVIS_BRANCH" \ - $CONTAINER sh -c "cd $BUILDDIR && cpp-coveralls -b $BUILDDIR -E '(^|.*/)(frob|mock|test)-.*|(^|.*/)(virtual-fixed-generated\.h)' --gcov-options '\-lp'" + $CONTAINER su user sh -c "cd $SRCDIR && /home/user/.local/bin/cpp-coveralls -b $BUILDDIR -E '(^|.*/)(frob|mock|test)-.*|(^|.*/)(virtual-fixed-generated\.c)' --gcov-options '\-lp'" fi -- cgit v1.1