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/io/qprocess/test | |
| 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/io/qprocess/test')
| -rw-r--r-- | tests/auto/corelib/io/qprocess/test/CMakeLists.txt | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/tests/auto/corelib/io/qprocess/test/CMakeLists.txt b/tests/auto/corelib/io/qprocess/test/CMakeLists.txt index 086a5663e8..9cd8fee6e8 100644 --- a/tests/auto/corelib/io/qprocess/test/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/test/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from test.pro. - ##################################################################### ## tst_qprocess Test: ##################################################################### @@ -13,14 +11,33 @@ qt_internal_add_test(tst_qprocess Qt::Network ) -#### Keys ignored in scope 1:.:.:test.pro:<TRUE>: -# TEST_HELPER_INSTALLS = "../testProcessSpacesArgs/nospace" "../testProcessSpacesArgs/one space" "../testProcessSpacesArgs/two space s" "../test Space In Name/testSpaceInName" - -## Scopes: -##################################################################### +## Build assorted sub-programs called from the test: +add_dependencies(tst_qprocess + testProcessCrash + testProcessEcho + testProcessEcho2 + testProcessEcho3 + testProcessEnvironment + testProcessHang + testProcessNormal + testProcessOutput + testProcessDeadWhileReading + testProcessEOF + testExitCodes + testForwarding + testDetached + fileWriterProcess + testSetWorkingDirectory + testSoftExit + nospace onespace twospaces + testSpaceInName +) +if(TARGET Qt::Widgets) + add_dependencies(tst_qprocess testGuiProcess) +endif() +if(WIN32) + add_dependencies(tst_qprocess testProcessEchoGui testSetNamedPipeHandleState) +endif() #### Keys ignored in scope 2:.:.:test.pro:WIN32: # TESTDATA = "../testBatFiles/*" - -#### Keys ignored in scope 5:.:..:../qprocess.pri:NOT TARGET Qt::Widgets: -# SUBPROGRAMS = "-testGuiProcess" |