diff options
| author | Renato Filho <renato.filho@openbossa.org> | 2010-07-13 15:12:28 -0300 |
|---|---|---|
| committer | Renato Filho <renato.filho@openbossa.org> | 2010-07-13 16:16:03 -0300 |
| commit | e2056540d55033e8415246c2d17d9750bd30c1f0 (patch) | |
| tree | 3a85332d592abcd1a7db1f3c8ed924c351aa112e /tests | |
| parent | bac154b896b39c1e817742ce2213da3e0d346977 (diff) | |
Uset 60 secs as default test timeout.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
Luciano Wolf <luciano.wolf@openbossa.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c1a03764d..adf41791d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,4 +1,6 @@ -set(PYSIDE_TIMEOUT 10) +if(NOT CTEST_TESTING_TIMEOUT) + set(CTEST_TESTING_TIMEOUT 60) +endif() macro(TEST_QT_MODULE var name) if(NOT DISABLE_${name} AND ${var}) @@ -19,7 +21,7 @@ macro(PYSIDE_TEST) set(TEST_CMD ${CMAKE_SOURCE_DIR}/tests/run_test.sh ${libpyside_BINARY_DIR} "${CMAKE_BINARY_DIR}:${CMAKE_SOURCE_DIR}/tests/util" ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/${ARGV0}") add_test(${TEST_NAME} ${TEST_CMD}) set_tests_properties(${TEST_NAME} PROPERTIES - TIMEOUT ${PYSIDE_TIMEOUT} + TIMEOUT ${CTEST_TESTING_TIMEOUT} WILL_FAIL ${EXPECT_TO_FAIL}) endmacro(PYSIDE_TEST) |