diff options
Diffstat (limited to 'tests/auto/network/socket/qtcpsocket/test')
3 files changed, 8 insertions, 75 deletions
diff --git a/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt deleted file mode 100644 index 22a105887d..0000000000 --- a/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# Generated from test.pro. - -##################################################################### -## tst_qtcpsocket Test: -##################################################################### - -qt_add_test(tst_qtcpsocket - SOURCES - ../tst_qtcpsocket.cpp - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate -) - -## Scopes: -##################################################################### - -qt_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 3b4bd856a3..c3258f8a95 100644 --- a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt @@ -1,35 +1,24 @@ -# Generated from test.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qtcpsocket Test: ##################################################################### -qt_add_test(tst_qtcpsocket - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case +qt_internal_add_test(tst_qtcpsocket + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qtcpsocket.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - QT_TEST_SERVER_LIST "danted" "squid" "apache2" "ftp-proxy" "vsftpd" "iptables" "cyrus" # special case + QT_TEST_SERVER_LIST "danted" "squid" "apache2" "ftp-proxy" "vsftpd" "iptables" "cyrus" ) ## Scopes: ##################################################################### -qt_extend_target(tst_qtcpsocket CONDITION WIN32 - PUBLIC_LIBRARIES +qt_internal_extend_target(tst_qtcpsocket CONDITION WIN32 + 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/test.pro b/tests/auto/network/socket/qtcpsocket/test/test.pro deleted file mode 100644 index 4c07b1ec66..0000000000 --- a/tests/auto/network/socket/qtcpsocket/test/test.pro +++ /dev/null @@ -1,23 +0,0 @@ -CONFIG += testcase - -QT = core-private network-private testlib -SOURCES += ../tst_qtcpsocket.cpp - -win32: QMAKE_USE += ws2_32 -TARGET = tst_qtcpsocket - -win32 { - CONFIG(debug, debug|release) { - DESTDIR = ../debug -} else { - DESTDIR = ../release - } -} else { - DESTDIR = ../ -} - -# Only on Linux until cyrus has been added to docker-compose-for-{windows,macOS}.yml and tested -linux { - CONFIG += unsupported/testserver - QT_TEST_SERVER_LIST = danted squid apache2 ftp-proxy vsftpd iptables cyrus -} |