From 6887ae2ff9f66bc30161d6234ca7afa93a5d4b22 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 24 Jul 2019 13:03:33 +0200 Subject: cmake: Enable network test Task-number: QTBUG-74146 Change-Id: Ib29d1531f89676afb2b4df5032529b731ace029d Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- .../auto/network/socket/qtcpsocket/CMakeLists.txt | 7 ++++ .../socket/qtcpsocket/stressTest/CMakeLists.txt | 20 +++++++++++ .../network/socket/qtcpsocket/test/CMakeLists.txt | 40 ++++++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 tests/auto/network/socket/qtcpsocket/CMakeLists.txt create mode 100644 tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt create mode 100644 tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt (limited to 'tests/auto/network/socket/qtcpsocket') diff --git a/tests/auto/network/socket/qtcpsocket/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/CMakeLists.txt new file mode 100644 index 0000000000..b3ad79cba9 --- /dev/null +++ b/tests/auto/network/socket/qtcpsocket/CMakeLists.txt @@ -0,0 +1,7 @@ +# Generated from qtcpsocket.pro. + +add_subdirectory(test) + +if(NOT VXWORKS) + add_subdirectory(stressTest) +endif() diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt new file mode 100644 index 0000000000..03c40c1a1f --- /dev/null +++ b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from stressTest.pro. + +##################################################################### +## stressTest Binary: +##################################################################### + +add_qt_executable(stressTest + SOURCES + Test.cpp Test.h + main.cpp + PUBLIC_LIBRARIES + Qt::Network + Qt::Test +) + +#### Keys ignored in scope 1:.:.:stressTest.pro:: +# CONFIG = "cmdline" +# DESTDIR = "./" +# MOC_DIR = ".moc/" +# TMP_DIR = ".tmp/" diff --git a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt new file mode 100644 index 0000000000..b308004d24 --- /dev/null +++ b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt @@ -0,0 +1,40 @@ +# Generated from test.pro. + +##################################################################### +## tst_qtcpsocket Test: +##################################################################### + +add_qt_test(tst_qtcpsocket + GUI + SOURCES + ../tst_qtcpsocket.cpp + LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate + PUBLIC_LIBRARIES + Qt::Network +) + +#### Keys ignored in scope 1:.:.:test.pro:: +# CONFIG = "testcase" + +## Scopes: +##################################################################### + +extend_target(tst_qtcpsocket CONDITION WIN32 + PUBLIC_LIBRARIES + ws2_32 +) + +#### Keys ignored in scope 4:.:.:test.pro:(CMAKE_BUILD_TYPE STREQUAL Debug): +# DESTDIR = "../debug" + +#### Keys ignored in scope 5:.:.:test.pro:else: +# DESTDIR = "../release" + +#### Keys ignored in scope 6:.:.:test.pro:else: +# DESTDIR = "../" + +#### Keys ignored in scope 7:.:.:test.pro:LINUX: +# CONFIG = "unsupported/testserver" +# QT_TEST_SERVER_LIST = "danted" "squid" "apache2" "ftp-proxy" "vsftpd" "iptables" "cyrus" -- cgit v1.2.3 From aaec0726234f1e7eb23087b04426591b81307e5a Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 9 Aug 2019 12:57:50 +0200 Subject: Fix linking of tst_qtcpsocket on Linux The direct use of pthread_yield() requires pthread linkage, which -- according to the cmake docs -- is best done by using CMake's Threads::Threads target and the -pthread compiler flag preference. Change-Id: Iacbd7dfce3ee2f792cea7f58d52b6b8ba8a84b18 Reviewed-by: Alexandru Croitor Reviewed-by: Qt CMake Build Bot --- tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tests/auto/network/socket/qtcpsocket') diff --git a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt index b308004d24..19cb1256cc 100644 --- a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt @@ -26,6 +26,12 @@ extend_target(tst_qtcpsocket CONDITION WIN32 ws2_32 ) +# special case begin +set(THREADS_PREFER_PTHREAD_FLAG 1) +find_package(Threads) +target_link_libraries(tst_qtcpsocket PRIVATE Threads::Threads) +# special case end + #### Keys ignored in scope 4:.:.:test.pro:(CMAKE_BUILD_TYPE STREQUAL Debug): # DESTDIR = "../debug" -- cgit v1.2.3 From 3d1c6b76e7d179e6c85d332baa1cc19c9dd13341 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 16 Aug 2019 12:52:09 +0200 Subject: 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 Reviewed-by: Leander Beernaert Reviewed-by: Qt CMake Build Bot --- tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests/auto/network/socket/qtcpsocket') 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:: -# CONFIG = "cmdline" -# DESTDIR = "./" # MOC_DIR = ".moc/" # TMP_DIR = ".tmp/" -- cgit v1.2.3 From 164d8c35b3d8d26f98e677f46ecad513702e540c Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 12 Nov 2019 17:58:44 +0100 Subject: Regenerate tests/auto/network/socket Change-Id: I653f7f4a6e3421f56f873cfbec4309eca49f1756 Reviewed-by: Simon Hausmann --- .../socket/qtcpsocket/stressTest/CMakeLists.txt | 2 +- .../socket/qtcpsocket/test/.prev_CMakeLists.txt | 35 ++++++++++++++++++++++ .../network/socket/qtcpsocket/test/CMakeLists.txt | 5 ---- 3 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt (limited to 'tests/auto/network/socket/qtcpsocket') diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt index 381a5a72de..da9d3a324f 100644 --- a/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### add_qt_executable(stressTest - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES Test.cpp Test.h main.cpp diff --git a/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt new file mode 100644 index 0000000000..238c6b9931 --- /dev/null +++ b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt @@ -0,0 +1,35 @@ +# Generated from test.pro. + +##################################################################### +## tst_qtcpsocket Test: +##################################################################### + +add_qt_test(tst_qtcpsocket + SOURCES + ../tst_qtcpsocket.cpp + LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate + PUBLIC_LIBRARIES + Qt::Network +) + +## Scopes: +##################################################################### + +extend_target(tst_qtcpsocket CONDITION WIN32 + PUBLIC_LIBRARIES + ws2_32 +) + +#### Keys ignored in scope 4:.:.:test.pro:(CMAKE_BUILD_TYPE STREQUAL Debug): +# DESTDIR = "../debug" + +#### Keys ignored in scope 5:.:.:test.pro:else: +# DESTDIR = "../release" + +#### Keys ignored in scope 6:.:.:test.pro:else: +# DESTDIR = "../" + +#### Keys ignored in scope 7:.:.:test.pro:LINUX: +# QT_TEST_SERVER_LIST = "danted" "squid" "apache2" "ftp-proxy" "vsftpd" "iptables" "cyrus" diff --git a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt index 19cb1256cc..9523830a15 100644 --- a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qtcpsocket - GUI SOURCES ../tst_qtcpsocket.cpp LIBRARIES @@ -15,9 +14,6 @@ add_qt_test(tst_qtcpsocket Qt::Network ) -#### Keys ignored in scope 1:.:.:test.pro:: -# CONFIG = "testcase" - ## Scopes: ##################################################################### @@ -42,5 +38,4 @@ target_link_libraries(tst_qtcpsocket PRIVATE Threads::Threads) # DESTDIR = "../" #### Keys ignored in scope 7:.:.:test.pro:LINUX: -# CONFIG = "unsupported/testserver" # QT_TEST_SERVER_LIST = "danted" "squid" "apache2" "ftp-proxy" "vsftpd" "iptables" "cyrus" -- cgit v1.2.3