Skip to content

Commit fa5bd49

Browse files
committed
run code_layout build from top CMakeLists
instead of adding an extra CMakeLists in .ci/travis/code_layout to build API doc, astyle and run tests (indentation, spelling, sip, doc coverage), the top CMakeLists has been adapted to allow not building core libraries and possibly just the static code layout * astyle has been moved from /src/astyle to /lib/astyle (I would propose to move all external libraries, and possibly add git submodules)
1 parent c8555c3 commit fa5bd49

35 files changed

+633
-627
lines changed

.ci/travis/code_layout/CMakeLists.txt

Lines changed: 0 additions & 28 deletions
This file was deleted.

.ci/travis/code_layout/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ export CORES=2
1818
mkdir build
1919
cd build
2020

21-
cmake -DWITH_APIDOC=ON ../.ci/travis/code_layout
21+
cmake -DWITH_CORE=OFF -DWITH_APIDOC=ON -DWITH_ASTYLE=ON -DENABLE_TESTS=ON ..
2222
make -j${CORES}

.ci/travis/code_layout/script.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
###########################################################################
1515
set -e
1616

17-
DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
18-
19-
export QGISSTYLE=${DIR}/scripts/qgisstyle
20-
2117
pushd build
2218
xvfb-run ctest -V --output-on-failure
2319
popd

.ci/travis/linux/blacklist.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ PyQgsDBManagerGpkg
1111
# layout tests are run on separate build
1212
qgis_indentation
1313
qgis_spelling
14+
qgis_sipify
15+
qgis_sip_uptodate
1416

1517
# flacky
1618
qgis_filedownloader

.ci/travis/macos/blacklist.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
# layout tests are run on separate build
12
qgis_spelling
3+
qgis_sipify
4+
qgis_sip_uptodate
5+
26
qgis_openstreetmaptest
37
qgis_wcsprovidertest
48
PyQgsServer
@@ -49,4 +53,4 @@ PyQgsFileDownloader
4953
PyQgsSettings
5054
PyQgsConsole
5155
PyQgsLocator
52-
PyQgsAuthManagerPasswordOWSTest
56+
PyQgsAuthManagerPasswordOWSTest

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
.pydevproject
2222
/CMakeLists.txt.user
2323
/CMakeLists.txt.user.*
24-
.ci/travis/code_layout/scripts/qgisstyle*
2524
api_doc
2625
build*
2726
debian/*.debhelper

0 commit comments

Comments
 (0)