summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/socket/qtcpsocket
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-11-12 17:58:44 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-11-13 10:07:36 +0000
commit164d8c35b3d8d26f98e677f46ecad513702e540c (patch)
treed55dc6921104ffa4d57bef55d7238e677b83e12b /tests/auto/network/socket/qtcpsocket
parentee5db96ef70c493e04214d4b7822396d6edb7502 (diff)
Regenerate tests/auto/network/socket
Change-Id: I653f7f4a6e3421f56f873cfbec4309eca49f1756 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/network/socket/qtcpsocket')
-rw-r--r--tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt2
-rw-r--r--tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt35
-rw-r--r--tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt5
3 files changed, 36 insertions, 6 deletions
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:<TRUE>:
-# 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"