Skip to content

Commit 9c6e3cc

Browse files
committedMar 8, 2019
bring the lions
1 parent 65e126f commit 9c6e3cc

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed
 

‎.ci/travis/linux/docker-variables.env

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,12 @@ TRAVIS_OS_NAME
1212
TRAVIS_CONFIG
1313
TRAVIS
1414

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+
1522
# Other var
1623
QGIS_NO_OVERRIDE_IMPORT=1

‎.ci/travis/linux/script.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
set -e
1818

1919
# build QGIS in docker
20+
echo "travis_fold:start:docker_build_qgis"
21+
echo "${bold}Docker build QGIS${endbold}"
2022
docker run -t --name qgis_container \
2123
-v ${TRAVIS_BUILD_DIR}:/root/QGIS \
2224
-v ${CCACHE_DIR}:/root/.ccache \
@@ -26,11 +28,17 @@ docker run -t --name qgis_container \
2628

2729
# commit container
2830
docker commit qgis_container qgis_image
31+
echo "travis_fold:end:docker_build_qgis"
2932

3033
# running QGIS tests in commited image
34+
echo "travis_fold:start:docker_test_qgis"
35+
echo "${bold}Docker run tests${endbold}"
3136
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"
3238

3339
# running tests for the python test runner
40+
echo "travis_fold:start:docker_test_runners"
41+
echo "${bold}Docker test QGIS runners${endbold}"
3442
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"
3543
sleep 8 # Wait for xvfb to finish starting
3644

@@ -48,3 +56,4 @@ do
4856
echo "test ${i}..."
4957
[[ $(docker exec -it qgis-testing-environment sh -c "cd /tests_directory && qgis_testrunner.sh ${i}" &>/dev/null) -eq "${testrunners[$i]}" ]] && echo "success" || exit 1
5058
done
59+
echo "travis_fold:end:docker_test_runners"

‎.ci/travis/linux/scripts/docker-qgis-build.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,6 @@ ccache -M 1G
1212
# export CCACHE_LOGFILE=/tmp/cache.debug
1313
ccache -z
1414

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-
2415
##############################
2516
# Variables for output styling
2617
##############################

0 commit comments

Comments
 (0)
Please sign in to comment.