aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorNiels Ole Salscheider <niels_ole@salscheider-online.de>2018-09-30 09:45:31 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2018-09-30 10:53:00 +0200
commit6cde357e29c70f2722d76924b5f8a10a5de9db4d (patch)
tree774d598cafb1f49231081ce03b8937ba42b5e695 /tests
parentdc6cd07b45afa0e49434ba4453da59dd3ace3539 (diff)
downloadqxmpp-6cde357e29c70f2722d76924b5f8a10a5de9db4d.tar.gz
travis: Only use system binaries
Diffstat (limited to 'tests')
-rwxr-xr-xtests/travis/build-and-test6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/travis/build-and-test b/tests/travis/build-and-test
index adc7bb48..09000e61 100755
--- a/tests/travis/build-and-test
+++ b/tests/travis/build-and-test
@@ -15,9 +15,13 @@ case "$CONFIG" in
;;
esac
-# pick up cmake files from homebrew
if [ "$(uname -s)" = "Darwin" ]; then
+ # pick up cmake files from homebrew
CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5"
+else
+ # This hides all the paths that contain custom travis binaries like the
+ # updated version of cmake.
+ export PATH=/usr/sbin:/usr/bin:/sbin:/bin
fi
# build with code coverage