summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/network/socket/CMakeLists.txt2
-rw-r--r--tests/auto/network/socket/qlocalsocket/CMakeLists.txt15
-rw-r--r--tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt28
3 files changed, 13 insertions, 32 deletions
diff --git a/tests/auto/network/socket/CMakeLists.txt b/tests/auto/network/socket/CMakeLists.txt
index a4b19ac1d6..7e72b4be29 100644
--- a/tests/auto/network/socket/CMakeLists.txt
+++ b/tests/auto/network/socket/CMakeLists.txt
@@ -7,7 +7,7 @@ if(QT_FEATURE_private_tests)
add_subdirectory(platformsocketengine)
endif()
add_subdirectory(qudpsocket)
-### add_subdirectory(qlocalsocket) # special case
+add_subdirectory(qlocalsocket)
add_subdirectory(qtcpserver)
add_subdirectory(qabstractsocket)
if(QT_FEATURE_sctp)
diff --git a/tests/auto/network/socket/qlocalsocket/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/CMakeLists.txt
index 97466174f9..23f2b833e2 100644
--- a/tests/auto/network/socket/qlocalsocket/CMakeLists.txt
+++ b/tests/auto/network/socket/qlocalsocket/CMakeLists.txt
@@ -1,4 +1,13 @@
-# Generated from qlocalsocket.pro.
-
-add_subdirectory(test)
+# special case begin
add_subdirectory(socketprocess)
+
+qt_internal_add_test(tst_qlocalsocket
+ SOURCES
+ tst_qlocalsocket.cpp
+ DEFINES
+ QLOCALSERVER_DEBUG
+ QLOCALSOCKET_DEBUG
+ PUBLIC_LIBRARIES
+ Qt::Network
+)
+# special case end
diff --git a/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt
deleted file mode 100644
index 3a2899239f..0000000000
--- a/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-# Generated from test.pro.
-
-#####################################################################
-## tst_qlocalsocket Test:
-#####################################################################
-
-qt_internal_add_test(tst_qlocalsocket
- SOURCES
- ../tst_qlocalsocket.cpp
- DEFINES
- QLOCALSERVER_DEBUG
- QLOCALSOCKET_DEBUG
- SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../\\\"
- PUBLIC_LIBRARIES
- Qt::Network
-)
-
-## Scopes:
-#####################################################################
-
-#### Keys ignored in scope 3:.:.:test.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
-# DESTDIR = "../debug"
-
-#### Keys ignored in scope 4:.:.:test.pro:else:
-# DESTDIR = "../release"
-
-#### Keys ignored in scope 5:.:.:test.pro:else:
-# DESTDIR = ".."