summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/socket/qtcpserver
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-07-24 13:03:33 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-07-29 13:14:55 +0000
commit6887ae2ff9f66bc30161d6234ca7afa93a5d4b22 (patch)
tree7a4340ffd2f77e2a503b48bc3e27b1e2c8461363 /tests/auto/network/socket/qtcpserver
parent1307736c7db1ff24e3b8282f4a7b14d24866feba (diff)
cmake: Enable network test
Task-number: QTBUG-74146 Change-Id: Ib29d1531f89676afb2b4df5032529b731ace029d Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/network/socket/qtcpserver')
-rw-r--r--tests/auto/network/socket/qtcpserver/CMakeLists.txt4
-rw-r--r--tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt23
-rw-r--r--tests/auto/network/socket/qtcpserver/test/CMakeLists.txt29
-rw-r--r--tests/auto/network/socket/qtcpserver/test/test.pro6
4 files changed, 59 insertions, 3 deletions
diff --git a/tests/auto/network/socket/qtcpserver/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/CMakeLists.txt
new file mode 100644
index 0000000000..01f6c8b672
--- /dev/null
+++ b/tests/auto/network/socket/qtcpserver/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from qtcpserver.pro.
+
+add_subdirectory(test)
+add_subdirectory(crashingServer)
diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt
new file mode 100644
index 0000000000..49ba806e1b
--- /dev/null
+++ b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from crashingServer.pro.
+
+#####################################################################
+## crashingServer Binary:
+#####################################################################
+
+add_qt_executable(crashingServer
+ GUI
+ 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/qtcpserver/test/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt
new file mode 100644
index 0000000000..af31c0762f
--- /dev/null
+++ b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_qtcpserver Test:
+#####################################################################
+
+add_qt_test(tst_qtcpserver
+ GUI
+ SOURCES
+ ../tst_qtcpserver.cpp
+ PUBLIC_LIBRARIES
+ Qt::Network
+)
+
+#### Keys ignored in scope 1:.:.:test.pro:<TRUE>:
+# CONFIG = "testcase"
+# MOC_DIR = "tmp"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qtcpserver CONDITION WIN32
+ PUBLIC_LIBRARIES
+ ws2_32
+)
+
+#### Keys ignored in scope 6:.:.:test.pro:LINUX:
+# CONFIG = "unsupported/testserver"
+# QT_TEST_SERVER_LIST = "danted" "cyrus" "squid" "ftp-proxy"
diff --git a/tests/auto/network/socket/qtcpserver/test/test.pro b/tests/auto/network/socket/qtcpserver/test/test.pro
index 7e2e60a1e3..491ff28cdc 100644
--- a/tests/auto/network/socket/qtcpserver/test/test.pro
+++ b/tests/auto/network/socket/qtcpserver/test/test.pro
@@ -3,13 +3,13 @@ SOURCES += ../tst_qtcpserver.cpp
win32: QMAKE_USE += ws2_32
-TARGET = ../tst_qtcpserver
+TARGET = tst_qtcpserver
win32 {
CONFIG(debug, debug|release) {
- TARGET = ../../debug/tst_qtcpserver
+ TARGET = ../debug/tst_qtcpserver
} else {
- TARGET = ../../release/tst_qtcpserver
+ TARGET = ../release/tst_qtcpserver
}
}