From abca143a0265004e20b56486a801a8bda4fff8b3 Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Fri, 8 Mar 2019 09:24:58 +0100 Subject: [PATCH] morning bbreeze --- .ci/travis/linux/script.sh | 2 +- .ci/travis/linux/scripts/docker-qgis-test.sh | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.ci/travis/linux/script.sh b/.ci/travis/linux/script.sh index 9b3a802f4293..5880b5317bb3 100755 --- a/.ci/travis/linux/script.sh +++ b/.ci/travis/linux/script.sh @@ -20,7 +20,7 @@ set -e docker run -t --name qgis_container \ -v ${TRAVIS_BUILD_DIR}:/root/QGIS \ -v ${CCACHE_DIR}:/root/.ccache \ - --env-file ${TRAVIS_BUILD_DIR}/.ci/travis/linux/docker-variables.env \ + /root/qgis_test_runner --env-file ${TRAVIS_BUILD_DIR}/.ci/travis/linux/docker-variables.env \ qgis/qgis3-build-deps:${DOCKER_TAG} \ /root/QGIS/.ci/travis/linux/scripts/docker-qgis-build.sh diff --git a/.ci/travis/linux/scripts/docker-qgis-test.sh b/.ci/travis/linux/scripts/docker-qgis-test.sh index 022a3d3cd96c..69ebee2d2e6d 100755 --- a/.ci/travis/linux/scripts/docker-qgis-test.sh +++ b/.ci/travis/linux/scripts/docker-qgis-test.sh @@ -2,21 +2,6 @@ set -e -############################## -# Run Python Tests on QGIS app -############################## -# Passing cases: -echo "QGIS tests runner" -pushd /root/qgis_test_runner -./qgis_testrunner.sh test_testrunner.run_passing && echo "1/5 succeeded" || exit 1 -./qgis_testrunner.sh test_testrunner.run_skipped_and_passing && echo "2/5 succeeded" || exit 1 -# Failing cases: -./qgis_testrunner.sh test_testrunner && exit 1 || echo "3/5 succeeded" -./qgis_testrunner.sh test_testrunner.run_all && exit 1 || echo "5/5 succeeded" -./qgis_testrunner.sh test_testrunner.run_failing && exit 1 || echo "5/5 succeeded" -popd - - # Temporarily uncomment to debug ccache issues # echo "travis_fold:start:ccache-debug" # cat /tmp/cache.debug