diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-16 12:52:09 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-23 09:25:27 +0000 |
| commit | 3d1c6b76e7d179e6c85d332baa1cc19c9dd13341 (patch) | |
| tree | 235be5e9f6d2c2f789ea70e07548bc28757a9dfd /tests/auto/network/socket | |
| parent | f96faa95aa8a7c57e2d87c9097179ed7968f1e00 (diff) | |
Regenerate tests that use helper processes
This is needed to make sure the output directory is in the correct
place somewhere under tests, rather than in $prefix/bin.
Change-Id: I98afa9c0a7517a8a10866b4c626bd4c4d2fd214f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'tests/auto/network/socket')
5 files changed, 5 insertions, 20 deletions
diff --git a/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt index 74fae14b7e..df1c934ec8 100644 --- a/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt +++ b/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt @@ -5,13 +5,10 @@ ##################################################################### add_qt_executable(socketprocess + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" SOURCES main.cpp PUBLIC_LIBRARIES Qt::Network Qt::Test ) - -#### Keys ignored in scope 1:.:.:socketprocess.pro:<TRUE>: -# CONFIG = "cmdline" -# DESTDIR = "./" diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt index 49ba806e1b..05035780b5 100644 --- a/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt @@ -6,18 +6,12 @@ add_qt_executable(crashingServer GUI + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" SOURCES main.cpp PUBLIC_LIBRARIES Qt::Network ) -#### Keys ignored in scope 1:.:.:crashingServer.pro:<TRUE>: -# CONFIG = "-app_bundle" -# DESTDIR = "./" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:crashingServer.pro:mingw: -# CONFIG = "console" diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt index 03c40c1a1f..381a5a72de 100644 --- a/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### add_qt_executable(stressTest + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" SOURCES Test.cpp Test.h main.cpp @@ -14,7 +15,5 @@ add_qt_executable(stressTest ) #### Keys ignored in scope 1:.:.:stressTest.pro:<TRUE>: -# CONFIG = "cmdline" -# DESTDIR = "./" # MOC_DIR = ".moc/" # TMP_DIR = ".tmp/" diff --git a/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt index 8af58786b9..057445675e 100644 --- a/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt +++ b/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt @@ -5,12 +5,9 @@ ##################################################################### add_qt_executable(clientserver + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" SOURCES main.cpp PUBLIC_LIBRARIES Qt::Network ) - -#### Keys ignored in scope 1:.:.:clientserver.pro:<TRUE>: -# CONFIG = "cmdline" -# DESTDIR = "./" diff --git a/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt index cc50d1a1d0..d9da87126f 100644 --- a/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt +++ b/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt @@ -5,11 +5,9 @@ ##################################################################### add_qt_executable(udpServer + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" # special case SOURCES main.cpp PUBLIC_LIBRARIES Qt::Network ) - -#### Keys ignored in scope 1:.:.:udpServer.pro:<TRUE>: -# CONFIG = "cmdline" |