File tree Expand file tree Collapse file tree 3 files changed +16
-9
lines changed Expand file tree Collapse file tree 3 files changed +16
-9
lines changed Original file line number Diff line number Diff line change @@ -12,5 +12,12 @@ TRAVIS_OS_NAME
12
12
TRAVIS_CONFIG
13
13
TRAVIS
14
14
15
+ # CTEST
16
+ LD_PRELOAD = /lib/x86_64-linux-gnu/libSegFault.so
17
+ SEGFAULT_SIGNALS = " abrt segv"
18
+ CTEST_BUILD_COMMAND = " /usr/bin/ninja"
19
+ CTEST_PARALLEL_LEVEL = 1
20
+ CTEST_BUILD_DIR = /root/QGIS
21
+
15
22
# Other var
16
23
QGIS_NO_OVERRIDE_IMPORT = 1
Original file line number Diff line number Diff line change 17
17
set -e
18
18
19
19
# build QGIS in docker
20
+ echo " travis_fold:start:docker_build_qgis"
21
+ echo " ${bold} Docker build QGIS${endbold} "
20
22
docker run -t --name qgis_container \
21
23
-v ${TRAVIS_BUILD_DIR} :/root/QGIS \
22
24
-v ${CCACHE_DIR} :/root/.ccache \
@@ -26,11 +28,17 @@ docker run -t --name qgis_container \
26
28
27
29
# commit container
28
30
docker commit qgis_container qgis_image
31
+ echo " travis_fold:end:docker_build_qgis"
29
32
30
33
# running QGIS tests in commited image
34
+ echo " travis_fold:start:docker_test_qgis"
35
+ echo " ${bold} Docker run tests${endbold} "
31
36
docker-compose -f ${TRAVIS_BUILD_DIR} /.ci/travis/linux/docker-compose.travis.yml run qgis-deps /root/QGIS/.ci/travis/linux/scripts/docker-qgis-test.sh
37
+ echo " travis_fold:end:docker_test_qgis"
32
38
33
39
# running tests for the python test runner
40
+ echo " travis_fold:start:docker_test_runners"
41
+ echo " ${bold} Docker test QGIS runners${endbold} "
34
42
docker run -d --name qgis-testing-environment -v ${TRAVIS_BUILD_DIR} /tests/src/python:/tests_directory -e DISPLAY=:99 qgis_image " /usr/bin/supervisord -c /etc/supervisor/supervisord.conf"
35
43
sleep 8 # Wait for xvfb to finish starting
36
44
48
56
echo " test ${i} ..."
49
57
[[ $( docker exec -it qgis-testing-environment sh -c " cd /tests_directory && qgis_testrunner.sh ${i} " & > /dev/null) -eq " ${testrunners[$i]} " ]] && echo " success" || exit 1
50
58
done
59
+ echo " travis_fold:end:docker_test_runners"
Original file line number Diff line number Diff line change @@ -12,15 +12,6 @@ ccache -M 1G
12
12
# export CCACHE_LOGFILE=/tmp/cache.debug
13
13
ccache -z
14
14
15
- # ###########################
16
- # Setup the (c)test environment
17
- # ###########################
18
- export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
19
- export SEGFAULT_SIGNALS=" abrt segv"
20
- export CTEST_BUILD_COMMAND=" /usr/bin/ninja"
21
- export CTEST_PARALLEL_LEVEL=1
22
- export CTEST_BUILD_DIR=/root/QGIS
23
-
24
15
# #############################
25
16
# Variables for output styling
26
17
# #############################
You can’t perform that action at this time.
0 commit comments