Revert "try with dedicated for building"

This reverts commit 748c783.
qgis · Mar 7, 2019 · ee4b2dc · ee4b2dc
1 parent 748c783
commit ee4b2dc
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 124 deletions.
diff --git a/.ci/travis/linux/docker-build-test.sh b/.ci/travis/linux/docker-build-test.sh
@@ -2,6 +2,96 @@
 
 set -e
 
+##############
+# Setup ccache
+##############
+export CCACHE_TEMPDIR=/tmp
+ccache -M 1G
+
+# Temporarily uncomment to debug ccache issues
+# 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
+
+##############################
+# Variables for output styling
+##############################
+
+bold=$(tput bold)
+endbold=$(tput sgr0)
+
+###########
+# Configure
+###########
+pushd /root/QGIS > /dev/null
+mkdir -p build
+
+pushd build > /dev/null
+
+echo "travis_fold:start:cmake"
+echo "${bold}Running cmake...${endbold}"
+cmake \
+ -GNinja \
+ -DUSE_CCACHE=OFF \
+ -DWITH_QUICK=ON \
+ -DWITH_3D=ON \
+ -DWITH_STAGED_PLUGINS=ON \
+ -DWITH_GRASS=OFF \
+ -DSUPPRESS_QT_WARNINGS=ON \
+ -DENABLE_MODELTEST=ON \
+ -DENABLE_PGTEST=ON \
+ -DENABLE_MSSQLTEST=ON \
+ -DWITH_QSPATIALITE=ON \
+ -DWITH_QWTPOLAR=OFF \
+ -DWITH_APIDOC=OFF \
+ -DWITH_ASTYLE=OFF \
+ -DWITH_DESKTOP=ON \
+ -DWITH_BINDINGS=ON \
+ -DWITH_SERVER=ON \
+ -DDISABLE_DEPRECATED=ON \
+ -DPYTHON_TEST_WRAPPER="timeout -sSIGSEGV 55s"\
+ -DCXX_EXTRA_FLAGS="${CLANG_WARNINGS}" \
+ -DWERROR=TRUE \
+ -DQT5_3DEXTRA_LIBRARY="/usr/lib/x86_64-linux-gnu/libQt53DExtras.so" \
+ -DQT5_3DEXTRA_INCLUDE_DIR="/root/QGIS/external/qt3dextra-headers" \
+ -DCMAKE_PREFIX_PATH="/root/QGIS/external/qt3dextra-headers/cmake" \
+ ..
+echo "travis_fold:end:cmake"
+
+#######
+# Build
+#######
+# Calculate the timeout for building.
+# The tests should be aborted before travis times out, in order to allow uploading
+# the ccache and therefore speedup subsequent e builds.
+#
+# Travis will kill the job after approx 150 minutes, we subtract 5 minutes for
+# uploading and subtract the bootstrapping time from that.
+# Hopefully clocks are in sync :)
+TRAVIS_TIME=150
+UPLOAD_TIME=5
+CURRENT_TIME=$(date +%s)
+TIMEOUT=$((( TRAVIS_TIME - UPLOAD_TIME ) * 60 - CURRENT_TIME + TRAVIS_TIMESTAMP))
+TIMEOUT=$(( TIMEOUT < 300 ? 300 : TIMEOUT ))
+echo "Timeout: ${TIMEOUT}s (started at ${TRAVIS_TIMESTAMP}, current: ${CURRENT_TIME})"
+
+# echo "travis_fold:start:ninja-build.1"
+echo "${bold}Building QGIS...${endbold}"
+timeout ${TIMEOUT}s ${CTEST_BUILD_COMMAND}
+# echo "travis_fold:end:ninja-build.1"
+
+rv=$?
+if [ $rv -eq 124 ] ; then
+    printf '\n\n${bold}Build and test timeout. Please restart the build for meaningful results.${endbold}\n'
+    exit #$rv
+fi
 
 ##############################
 # Run Python Tests on QGIS app

diff --git a/.ci/travis/linux/script.sh b/.ci/travis/linux/script.sh
@@ -17,14 +17,4 @@
 set -e
 
 # running QGIS tests
-
-docker build -t qgis_testing -f .docker/qgis_testing.dockerfile .
-
-docker run qgis test.sh
-docker exec
-
-
-
 docker-compose -f ${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml run qgis-deps
-
-docker run -it qgis-deps
diff --git a/.docker/qgis3-build-deps-cosmic.dockerfile b/.docker/qgis3-build-deps-cosmic.dockerfile
@@ -135,3 +135,5 @@ ENV CXX=/usr/lib/ccache/clang++
 ENV QT_SELECT=5
 ENV LANG=C.UTF-8
 ENV PATH="/usr/local/bin:${PATH}"
+
+CMD /root/QGIS/.ci/travis/linux/docker-build-test.sh
diff --git a/.docker/qgis3-build-deps.dockerfile b/.docker/qgis3-build-deps.dockerfile
@@ -152,3 +152,5 @@ ENV CXX=/usr/lib/ccache/clang++
 ENV QT_SELECT=5
 ENV LANG=C.UTF-8
 ENV PATH="/usr/local/bin:${PATH}"
+
+CMD /root/QGIS/.ci/travis/linux/docker-build-test.sh
diff --git a/.docker/qgis_resources/test_runner/qgis_testrunner.sh b/.docker/qgis_resources/test_runner/qgis_testrunner.sh
@@ -10,6 +10,17 @@
 
 TEST_NAME=$1
 
+export PYTHONUNBUFFERED=TRUE
+
+echo "Running test $1 ..."
+
+qgis --version-migration --nologo --code /usr/bin/qgis_testrunner.py "$TEST_NAME"  2>/dev/null
+
+
+echo "Running test  with unbuffer $1 ..."
+
+unbuffer qgis --version-migration --nologo --code /usr/bin/qgis_testrunner.py "$TEST_NAME"  2>/dev/null
+
 echo "Running test really $1 ..."
 OUTPUT=$(QGIS_TEST_MODULE=${TEST_NAME} unbuffer qgis --version-migration --nologo --code /usr/bin/qgis_testrunner.py "$TEST_NAME"  2>/dev/null | tee /dev/tty )
 EXIT_CODE="$?"

diff --git a/.docker/qgis_testing.dockerfile b/.docker/qgis_testing.dockerfile