Skip to content

Commit

Permalink
Switch to make
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn authored and 3nids committed Aug 12, 2017
1 parent 332cc71 commit 1ae273a
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions .ci/travis/linux/docker-build-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ mkdir -p build-docker &&
pushd build-docker

cmake \
-GNinja \
-DWITH_STAGED_PLUGINS=ON \
-DWITH_GRASS=OFF \
-DSUPPRESS_QT_WARNINGS=ON \
Expand All @@ -38,8 +37,7 @@ cmake \

export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so

export CTEST_BUILD_COMMAND=ninja
export CTEST_BUILD_COMMAND=echo
export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"

python3 /root/QGIS/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -E "$(cat /root/QGIS/.ci/travis/linux/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S /root/QGIS/.ci/travis/travis.ctest --output-on-failure

Expand Down

0 comments on commit 1ae273a

Please sign in to comment.