Skip to content

Commit d097de4

Browse files
signedavsignedav
authoredOct 26, 2017
Merge branch 'master' into propertieslayout
·
ltr-3_40final-3_0_0
2 parents 3a547dc + 1ae0857 commit d097de4

File tree

2,915 files changed

+519289
-37479
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,915 files changed

+519289
-37479
lines changed
 

‎.ci/travis/code_layout/script.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ set -e
1616

1717
pushd build
1818

19+
export CTEST_BUILD_DIR=${TRAVIS_BUILD_DIR}
1920
export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"
20-
python3 ${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V --output-on-failure -S ${TRAVIS_BUILD_DIR}/.ci/travis/travis.ctest
2121

22-
ctest -V -R PyQgsDocCoverage
22+
python3 ${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V --output-on-failure -S ${TRAVIS_BUILD_DIR}/.ci/travis/travis.ctest
2323

2424
popd

‎.ci/travis/linux/after_script.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,3 @@
1212
# (at your option) any later version. #
1313
# #
1414
###########################################################################
15-
16-
ccache -s
17-
18-
[ -r /tmp/ctest-important.log ] && cat /tmp/ctest-important.log

0 commit comments

Comments
 (0)