diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-08 14:04:59 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-17 12:57:25 +0200 |
| commit | cbd33cb55757122e2c02356285c335af969dcd43 (patch) | |
| tree | d57e3098209fa16ad97bff1f315eface2bacc708 /tests/auto/corelib/thread | |
| parent | fb3549fc47b19de2956cd2dda07ef67ec529cf3e (diff) | |
Add missing dependencies of tests on their helper programs
This ensures that a command such as
$ ninja tst_qlocale && ninja tst_qlocale_check
will automagically build the syslocaleapp program that the test runs
from a subtest. Similar for testlib's selftests and tst_QProcess.
As a drive-by, pruned some legacy comments from when CMakeLists.txt
files were generated from .pro files.
Change-Id: I67691a8175aaef124d4104cf1898193993408bdf
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'tests/auto/corelib/thread')
| -rw-r--r-- | tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt | 11 |
2 files changed, 6 insertions, 11 deletions
diff --git a/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt index 1340b30388..26a691e8ca 100644 --- a/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt +++ b/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt @@ -1,6 +1,3 @@ -# special case skip regeneration -# Generated from qthreadstorage.pro. - ##################################################################### ## tst_qthreadstorage Test: ##################################################################### @@ -15,4 +12,7 @@ qt_internal_add_test(tst_qthreadstorage if(NOT ANDROID) add_subdirectory(crashonexit) + if(QT_FEATURE_process) + add_dependencies(tst_qthreadstorage crashOnExit_helper) + endif() endif() diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt index a6de9678c0..c76dbda738 100644 --- a/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt +++ b/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt @@ -1,15 +1,10 @@ -# Generated from crashonexit.pro. - ##################################################################### ## crashonexit Binary: ##################################################################### -qt_internal_add_executable(crashOnExit_helper # special case - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." # special case - INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashOnExit_helper" # special case +qt_internal_add_executable(crashOnExit_helper + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." + INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashOnExit_helper" SOURCES crashOnExit.cpp ) - -## Scopes: -##################################################################### |