diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-13 10:19:13 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-13 12:28:24 +0000 |
| commit | 1f2cdd8a04938ca8fa9df090a85c5d689df4c049 (patch) | |
| tree | 2121047df4baa46892b76336395195b823ee6f62 /cmake | |
| parent | 30af71d7eb6651e25355441261553c24fbd06927 (diff) | |
Add support for test timeouts
Change-Id: Iba805cbc16d179e5b080ccc00542329270075aa1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index d8d0980215..a356aeb8ef 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -2792,7 +2792,7 @@ endfunction() function(qt_add_test name) qt_parse_all_arguments(arg "qt_add_test" "RUN_SERIAL;EXCEPTIONS;GUI;QMLTEST" - "OUTPUT_DIRECTORY;WORKING_DIRECTORY" + "OUTPUT_DIRECTORY;WORKING_DIRECTORY;TIMEOUT" "QML_IMPORTPATH;TESTDATA;${__default_private_args};${__default_public_args}" ${ARGN} ) @@ -2889,6 +2889,9 @@ function(qt_add_test name) add_test(NAME "${name}" COMMAND ${test_executable} ${extra_test_args} -o ${name}.xml,xml -o -,txt WORKING_DIRECTORY "${test_working_dir}") endif() set_tests_properties("${name}" PROPERTIES RUN_SERIAL "${arg_RUN_SERIAL}" LABELS "${label}") + if (arg_TIMEOUT) + set_tests_properties(${name} PROPERTIES TIMEOUT ${arg_TIMEOUT}) + endif() # Get path to qtbase/bin, then prepend this path containing the shared libraries to PATH set(INSTALL_PREFIX_BIN "${CMAKE_INSTALL_PREFIX}/bin") |