diff options
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/travis/build-and-test | 9 | ||||
| -rwxr-xr-x | tests/travis/install-build-depends | 3 |
2 files changed, 1 insertions, 11 deletions
diff --git a/tests/travis/build-and-test b/tests/travis/build-and-test index dc5342b2..2d47e075 100755 --- a/tests/travis/build-and-test +++ b/tests/travis/build-and-test @@ -16,15 +16,6 @@ case "$CONFIG" in ;; esac -if [ $HOST_SYSTEM = "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 if [ "$CONFIG" = "full-debug" ]; then export CXXFLAGS="-fprofile-arcs -ftest-coverage" diff --git a/tests/travis/install-build-depends b/tests/travis/install-build-depends index b4b48cf2..3e543d91 100755 --- a/tests/travis/install-build-depends +++ b/tests/travis/install-build-depends @@ -4,7 +4,6 @@ set -e if [ "$(uname -s)" = "Darwin" ]; then brew update brew unlink python@2 - brew install qt case "$CONFIG" in full*) @@ -13,7 +12,7 @@ if [ "$(uname -s)" = "Darwin" ]; then esac else sudo apt-get update -qq - sudo apt-get install -qq clang cmake qtbase5-dev + sudo apt-get install -qq clang cmake case "$CONFIG" in full*) |