bring the lions

3nids · 3nids · commit 9c6e3ccd3c1d · 2019-03-08T13:21:25.000+01:00
diff --git a/.ci/travis/linux/docker-variables.env b/.ci/travis/linux/docker-variables.env
@@ -12,5 +12,12 @@ TRAVIS_OS_NAME
 TRAVIS_CONFIG
 TRAVIS
 
+# CTEST
+LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
+SEGFAULT_SIGNALS="abrt segv"
+CTEST_BUILD_COMMAND="/usr/bin/ninja"
+CTEST_PARALLEL_LEVEL=1
+CTEST_BUILD_DIR=/root/QGIS
+
 # Other var
 QGIS_NO_OVERRIDE_IMPORT=1
diff --git a/.ci/travis/linux/script.sh b/.ci/travis/linux/script.sh
@@ -17,6 +17,8 @@
 set -e
 
 # build QGIS in docker
+echo "travis_fold:start:docker_build_qgis"
+echo "${bold}Docker build QGIS${endbold}"
 docker run -t --name qgis_container \
            -v ${TRAVIS_BUILD_DIR}:/root/QGIS \
            -v ${CCACHE_DIR}:/root/.ccache \
@@ -26,11 +28,17 @@ docker run -t --name qgis_container \
 
 # commit container
 docker commit qgis_container qgis_image
+echo "travis_fold:end:docker_build_qgis"
 
 # running QGIS tests in commited image
+echo "travis_fold:start:docker_test_qgis"
+echo "${bold}Docker run tests${endbold}"
 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
+echo "travis_fold:end:docker_test_qgis"
 
 # running tests for the python test runner
+echo "travis_fold:start:docker_test_runners"
+echo "${bold}Docker test QGIS runners${endbold}"
 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"
 sleep 8  # Wait for xvfb to finish starting
 
@@ -48,3 +56,4 @@ do
   echo "test ${i}..."
   [[ $(docker exec -it qgis-testing-environment sh -c "cd /tests_directory && qgis_testrunner.sh ${i}" &>/dev/null) -eq "${testrunners[$i]}" ]] && echo "success" || exit 1
 done
+echo "travis_fold:end:docker_test_runners"
diff --git a/.ci/travis/linux/scripts/docker-qgis-build.sh b/.ci/travis/linux/scripts/docker-qgis-build.sh
@@ -12,15 +12,6 @@ ccache -M 1G
 # export CCACHE_LOGFILE=/tmp/cache.debug
 ccache -z
 
-############################
-# Setup the (c)test environment
-############################
-export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
-export SEGFAULT_SIGNALS="abrt segv"
-export CTEST_BUILD_COMMAND="/usr/bin/ninja"
-export CTEST_PARALLEL_LEVEL=1
-export CTEST_BUILD_DIR=/root/QGIS
-
 ##############################
 # Variables for output styling
 ##############################
