Merge branch 'master' into basicfix

.ci/travis/linux/before_script.sh

@@ -18,15 +18,8 @@ set -e
 
 pushd .docker
 
-source $(git rev-parse --show-toplevel)/.ci/travis/scripts/travis_envvar_helper.sh
-
-
-DOCKER_DEPS_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_EVENT_TYPE =~ push ]] && echo "true" || echo "false" )
+DOCKER_DEPS_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ "${TRAVIS_EVENT_TYPE}" != "pull_request" ]] && echo "true" || echo "false" )
 DOCKER_DEPS_IMAGE_REBUILD=$( [[ $TRAVIS_COMMIT_MESSAGE =~ '[docker] update dependencies' ]] && echo "true" || echo "false" )
-# on cron job, QGIS image is built and push without testing
-DOCKER_QGIS_IMAGE_BUILD_PUSH=$(create_qgis_image)
-QGIS_LAST_BUILD_SUCCESS=true # TODO use API to know if last build succeed https://developer.travis-ci.com/resource/builds
-
 
 echo "travis_fold:start:travis_env"
 echo "${bold}Travis environment variables${endbold}"
@@ -36,25 +29,25 @@ echo "DOCKER_TAG: $DOCKER_TAG"
 echo "TRAVIS_COMMIT_MESSAGE: $TRAVIS_COMMIT_MESSAGE"
 echo "DOCKER_DEPS_PUSH: $DOCKER_DEPS_PUSH"
 echo "DOCKER_DEPS_IMAGE_REBUILD: $DOCKER_DEPS_IMAGE_REBUILD"
-echo "DOCKER_QGIS_IMAGE_BUILD_PUSH: $DOCKER_QGIS_IMAGE_BUILD_PUSH"
-echo "QGIS_LAST_BUILD_SUCCESS: $QGIS_LAST_BUILD_SUCCESS"
+echo "DOCKER_BUILD_QGIS_IMAGE: $DOCKER_BUILD_QGIS_IMAGE"
+echo "DOCKER_BUILD_DEPS_FILE: $DOCKER_BUILD_DEPS_FILE"
 echo "TRAVIS_TIMESTAMP: $TRAVIS_TIMESTAMP"
 echo "travis_fold:end:travis_env"
 
 
 echo "travis_fold:start:docker_build"
 echo "${bold}Docker build deps${endbold}"
 docker --version
-if [[ $DOCKER_QGIS_IMAGE_BUILD_PUSH =~ false ]]; then
+if [[ $DOCKER_BUILD_QGIS_IMAGE =~ false ]]; then
   docker-compose --version
-  docker-compose -f "${DOCKER_COMPOSE}" config
+  docker-compose -f ${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml config
 fi
 
 if [[ $DOCKER_DEPS_IMAGE_REBUILD =~ true ]]; then
-  docker build --no-cache -t "qgis/qgis3-build-deps:${DOCKER_TAG}" -f qgis3-build-deps.dockerfile .
+  docker build --no-cache -t "qgis/qgis3-build-deps:${DOCKER_TAG}" -f ${DOCKER_BUILD_DEPS_FILE} .
 else
   docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true
-  docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_TAG}" -f qgis3-build-deps.dockerfile .
+  docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_TAG}" -f ${DOCKER_BUILD_DEPS_FILE} .
 fi
 echo "travis_fold:end:docker_build"
 

.ci/travis/linux/blacklist.txt

@@ -31,3 +31,7 @@ PyQgsAuthManagerPKIPostgresTest
 PyQgsAuthManagerPasswordPostgresTest
 PyQgsAuthManagerOgrPostgresTest
 PyQgsDbManagerPostgis
+
+# Needs an OpenCL device, the library is not enough
+qgis_openclutilstest
+

.ci/travis/linux/docker-build-test.sh

@@ -59,6 +59,9 @@ cmake \
  -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"
 

.ci/travis/code_layout/after_script.sh → .ci/travis/linux/docker_test.sh

@@ -1,10 +1,17 @@
 #!/usr/bin/env bash
 ###########################################################################
-#    after_script.sh
+#    docker_test.sh
+#
+#    Run a particular test on docker testing env and return its exit code
+#
+#    Arguments:
+#
+#        $1:  test name in dotted notation
+#
 #    ---------------------
-#    Date                 : February 2017
-#    Copyright            : (C) 2017 by Denis Rouzaud
-#    Email                : denis.rouzaud@gmail.com
+#    Date                 : November 2018
+#    Copyright            : (C) 2018 by Alessandro Pasotti
+#    Email                : elpaso at itopen dot it
 ###########################################################################
 #                                                                         #
 #   This program is free software; you can redistribute it and/or modify  #
@@ -13,3 +20,9 @@
 #   (at your option) any later version.                                   #
 #                                                                         #
 ###########################################################################
+
+TEST_NAME=$1
+
+docker exec -it qgis-testing-environment sh -c "cd /tests_directory && qgis_testrunner.sh ${TEST_NAME}" &>/dev/null
+
+echo $?

.ci/travis/linux/script.sh

@@ -16,18 +16,16 @@
 
 set -e
 
-source $(git rev-parse --show-toplevel)/.ci/travis/scripts/travis_envvar_helper.sh
-
-DOCKER_QGIS_IMAGE_BUILD_PUSH=$(create_qgis_image)
-
 mkdir -p "$CCACHE_DIR"
 
-if [[ $DOCKER_QGIS_IMAGE_BUILD_PUSH =~ true ]]; then
+if [[ ${DOCKER_BUILD_QGIS_IMAGE} =~ true ]]; then
+  # copy ccache dir within QGIS source so it can be accessed from docker
+  cp -r ${CCACHE_DIR} ${TRAVIS_BUILD_DIR}/.ccache
+  # building docker images
   DIR=$(git rev-parse --show-toplevel)/.docker
   pushd "${DIR}"
   echo "${bold}Building QGIS Docker image '${DOCKER_TAG}'...${endbold}"
-  docker build --build-arg CACHE_DIR=/root/.ccache \
-               --build-arg DOCKER_TAG="${DOCKER_TAG}" \
+  docker build --build-arg DOCKER_TAG="${DOCKER_TAG}" \
                --cache-from "qgis/qgis:${DOCKER_TAG}" \
                -t "qgis/qgis:${DOCKER_TAG}" \
                -f qgis.dockerfile ..
@@ -36,5 +34,21 @@ if [[ $DOCKER_QGIS_IMAGE_BUILD_PUSH =~ true ]]; then
   docker push "qgis/qgis:${DOCKER_TAG}"
   popd
 else
-  docker-compose -f "${DOCKER_COMPOSE}" run --rm qgis-deps
+  # running QGIS tests
+  docker-compose -f ${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml run --rm qgis-deps
+
+  # running tests for the python test runner
+  docker run -d --name qgis-testing-environment -v ${TRAVIS_BUILD_DIR}/tests/src/python:/tests_directory -e DISPLAY=:99 "qgis/qgis:${DOCKER_TAG}"
+  sleep 10  # Wait for xvfb to finish starting
+  # Temporary workaround until docker images are built
+  docker cp ${TRAVIS_BUILD_DIR}/.docker/qgis_resources/test_runner/qgis_testrunner.sh qgis-testing-environment:/usr/bin/qgis_testrunner.sh
+  # Run tests in the docker
+  # Passing cases:
+  TEST_SCRIPT_PATH=${TRAVIS_BUILD_DIR}/.ci/travis/linux/docker_test.sh
+  [[ $(${TEST_SCRIPT_PATH} test_testrunner.run_passing) -eq '0' ]]
+  [[ $(${TEST_SCRIPT_PATH} test_testrunner.run_skipped_and_passing) -eq '0' ]]
+  # Failing cases:
+  [[ $(${TEST_SCRIPT_PATH} test_testrunner) -eq '1' ]]
+  [[ $(${TEST_SCRIPT_PATH} test_testrunner.run_all) -eq '1' ]]
+  [[ $(${TEST_SCRIPT_PATH} test_testrunner.run_failing) -eq '1' ]]
 fi