summaryrefslogtreecommitdiffstats
path: root/tests/auto/network
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/network')
-rw-r--r--tests/auto/network/kernel/CMakeLists.txt12
-rw-r--r--tests/auto/network/kernel/kernel.pro8
-rw-r--r--tests/auto/network/socket/qlocalsocket/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/network/socket/qlocalsocket/CMakeLists.txt5
4 files changed, 18 insertions, 11 deletions
diff --git a/tests/auto/network/kernel/CMakeLists.txt b/tests/auto/network/kernel/CMakeLists.txt
index 0b25020694..8b8960d0ae 100644
--- a/tests/auto/network/kernel/CMakeLists.txt
+++ b/tests/auto/network/kernel/CMakeLists.txt
@@ -1,14 +1,16 @@
+# Generated from kernel.pro.
+
add_subdirectory(qdnslookup)
add_subdirectory(qdnslookup_appless)
+add_subdirectory(qnetworkproxyfactory)
+add_subdirectory(qnetworkproxy)
add_subdirectory(qnetworkinterface)
add_subdirectory(qnetworkdatagram)
add_subdirectory(qnetworkaddressentry)
add_subdirectory(qhostaddress)
-
+if(QT_FEATURE_private_tests AND NOT MACOS)
+ add_subdirectory(qhostinfo)
+endif()
if(QT_FEATURE_private_tests)
add_subdirectory(qauthenticator)
-
- if(NOT MACOS)
- add_subdirectory(qhostinfo)
- endif()
endif()
diff --git a/tests/auto/network/kernel/kernel.pro b/tests/auto/network/kernel/kernel.pro
index c13378cc02..c701a7fdc0 100644
--- a/tests/auto/network/kernel/kernel.pro
+++ b/tests/auto/network/kernel/kernel.pro
@@ -9,12 +9,12 @@ SUBDIRS=\
qnetworkinterface \
qnetworkdatagram \
qnetworkaddressentry \
- qhostaddress \
+ qhostaddress
-osx: SUBDIRS -= \ # QTBUG-41847
- qhostinfo \
+# QTBUG-41847
+osx: SUBDIRS -= qhostinfo
!qtConfig(private_tests): SUBDIRS -= \
qauthenticator \
- qhostinfo \
+ qhostinfo
diff --git a/tests/auto/network/socket/qlocalsocket/.prev_CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..97466174f9
--- /dev/null
+++ b/tests/auto/network/socket/qlocalsocket/.prev_CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from qlocalsocket.pro.
+
+add_subdirectory(test)
+add_subdirectory(socketprocess)
diff --git a/tests/auto/network/socket/qlocalsocket/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/CMakeLists.txt
index 23f2b833e2..b0eca25191 100644
--- a/tests/auto/network/socket/qlocalsocket/CMakeLists.txt
+++ b/tests/auto/network/socket/qlocalsocket/CMakeLists.txt
@@ -1,6 +1,7 @@
-# special case begin
-add_subdirectory(socketprocess)
+# Generated from qlocalsocket.pro.
+# add_subdirectory(test) # special case remove
+add_subdirectory(socketprocess)
qt_internal_add_test(tst_qlocalsocket
SOURCES
tst_qlocalsocket.cpp