forked from qt-creator/qt-creator
CMake build: Remove timeout for dumper tests
They take much longer, but are also optional. Makes it possible to run via e.g. "ctest -V -R tst_debugger_dumpers" Change-Id: I8bbda6ca36e25cd896b1f3be5d1696a27b8acc53 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
@@ -641,7 +641,7 @@ function(extend_qtc_executable name)
|
|||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
function(add_qtc_test name)
|
function(add_qtc_test name)
|
||||||
cmake_parse_arguments(_arg "GTEST" "" "DEFINES;DEPENDS;INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC" ${ARGN})
|
cmake_parse_arguments(_arg "GTEST" "TIMEOUT" "DEFINES;DEPENDS;INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC" ${ARGN})
|
||||||
|
|
||||||
foreach(dependency ${_arg_DEPENDS})
|
foreach(dependency ${_arg_DEPENDS})
|
||||||
if (NOT TARGET ${dependency} AND NOT _arg_GTEST)
|
if (NOT TARGET ${dependency} AND NOT _arg_GTEST)
|
||||||
@@ -684,7 +684,12 @@ function(add_qtc_test name)
|
|||||||
|
|
||||||
if (NOT _arg_GTEST)
|
if (NOT _arg_GTEST)
|
||||||
add_test(NAME ${name} COMMAND ${name})
|
add_test(NAME ${name} COMMAND ${name})
|
||||||
finalize_test_setup(${name})
|
if (DEFINED _arg_TIMEOUT)
|
||||||
|
set(timeout_option TIMEOUT ${_arg_TIMEOUT})
|
||||||
|
else()
|
||||||
|
set(timeout_option)
|
||||||
|
endif()
|
||||||
|
finalize_test_setup(${name} ${timeout_option})
|
||||||
endif()
|
endif()
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
|
@@ -211,11 +211,17 @@ function(set_public_includes target includes)
|
|||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
function(finalize_test_setup test_name)
|
function(finalize_test_setup test_name)
|
||||||
|
cmake_parse_arguments(_arg "" "TIMEOUT" "" ${ARGN})
|
||||||
|
if (DEFINED _arg_TIMEOUT)
|
||||||
|
set(timeout ${_arg_TIMEOUT})
|
||||||
|
else()
|
||||||
|
set(timeout 5)
|
||||||
|
endif()
|
||||||
# Never translate tests:
|
# Never translate tests:
|
||||||
set_tests_properties(${name}
|
set_tests_properties(${name}
|
||||||
PROPERTIES
|
PROPERTIES
|
||||||
QT_SKIP_TRANSLATION ON
|
QT_SKIP_TRANSLATION ON
|
||||||
TIMEOUT 5
|
TIMEOUT ${timeout}
|
||||||
)
|
)
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
|
@@ -9,6 +9,7 @@ add_qtc_test(tst_debugger_disassembler
|
|||||||
|
|
||||||
if (WITH_DEBUGGER_DUMPERS)
|
if (WITH_DEBUGGER_DUMPERS)
|
||||||
add_qtc_test(tst_debugger_dumpers
|
add_qtc_test(tst_debugger_dumpers
|
||||||
|
TIMEOUT 0
|
||||||
DEPENDS Qt5::Network Utils
|
DEPENDS Qt5::Network Utils
|
||||||
DEFINES DUMPERDIR="${PROJECT_SOURCE_DIR}/share/qtcreator/debugger"
|
DEFINES DUMPERDIR="${PROJECT_SOURCE_DIR}/share/qtcreator/debugger"
|
||||||
INCLUDES
|
INCLUDES
|
||||||
|
Reference in New Issue
Block a user