Skip to content
Permalink
Browse files

Don't run qt5 tests in parallel

  • Loading branch information
m-kuhn committed Mar 23, 2016
1 parent ded1e04 commit e6c5301cf845a3dc62028d64b51880a174b7fee8
Showing with 7 additions and 1 deletion.
  1. +1 −0 ci/travis/linux/qt5/script.sh
  2. +6 −1 qgis-test-travis.ctest
@@ -1,4 +1,5 @@
export PYTHONPATH=${HOME}/osgeo4travis/lib/python3.3/site-packages/
export CTEST_PARALLEL_LEVEL=1

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

@@ -15,6 +15,11 @@ ELSE()
ENDIF()
SET (CTEST_BUILD_CONFIGURATION "Release")
SET (CTEST_TEST_TIMEOUT 60) # 60 seconds
IF(DEFINED ENV{CTEST_PARALLEL_LEVEL})
SET(PARALLEL_LEVEL $ENV{CTEST_PARALLEL_LEVEL})
ELSE(DEFINED ENV{CTEST_PARALLEL_LEVEL})
SET(PARALLEL_LEVEL 2)
ENDIF(DEFINED ENV{CTEST_PARALLEL_LEVEL})

SET (INITIAL_CACHE "
BUILDNAME:STRING=${CTEST_BUILD_NAME}
@@ -69,7 +74,7 @@ IF(NOT ${BUILDRES} EQUAL 0 OR NOT ${NUMERR} EQUAL 0)
MESSAGE( FATAL_ERROR " ${Red}Build failed. Not running tests.${ColorReset}" )
MESSAGE("")
ENDIF(NOT ${BUILDRES} EQUAL 0 OR NOT ${NUMERR} EQUAL 0)
ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" PARALLEL_LEVEL 2 RETURN_VALUE TESTRES)
ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" PARALLEL_LEVEL ${PARALLEL_LEVEL} RETURN_VALUE TESTRES)
IF(NOT ${NUMWARN} EQUAL 0 OR NOT ${TESTRES} EQUAL 0)
ctest_submit (RETRY_COUNT 3 RETRY_DELAY 30)
MESSAGE("")

0 comments on commit e6c5301

Please sign in to comment.
You can’t perform that action at this time.