Skip to content

Commit d2f11b3

Browse files
m-kuhnm-kuhn
committedSep 28, 2017
Merge remote-tracking branch 'qgis/master' into propertieslayout
·
ltr-3_40final-3_0_0
2 parents ae806ad + f9f5aaf commit d2f11b3

File tree

3,268 files changed

+109164
-71782
lines changed

Some content is hidden

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

3,268 files changed

+109164
-71782
lines changed
 

‎.ci/travis/code_layout/install.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
export CORES=2
1717

1818
mkdir build
19-
cd build
19+
pushd build
2020

2121
cmake -DWITH_CORE=OFF -DWITH_APIDOC=ON -DWITH_ASTYLE=ON -DENABLE_TESTS=ON ..
22-
make -j${CORES}
22+
23+
popd

‎.ci/travis/code_layout/script.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
set -e
1616

1717
pushd build
18+
1819
export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"
19-
python ${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -E "sip_uptodate|spelling" --output-on-failure -S ${TRAVIS_BUILD_DIR}/.ci/travis/travis.ctest
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
21+
22+
ctest -V -R PyQgsDocCoverage
23+
2024
popd

0 commit comments

Comments
 (0)