diff options
Diffstat (limited to 'tests/auto/network/socket/qtcpserver/test')
3 files changed, 9 insertions, 60 deletions
diff --git a/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt deleted file mode 100644 index f842fda311..0000000000 --- a/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Generated from test.pro. - -##################################################################### -## tst_qtcpserver Test: -##################################################################### - -qt_internal_add_test(tst_qtcpserver - SOURCES - ../tst_qtcpserver.cpp - PUBLIC_LIBRARIES - Qt::Network -) - -#### Keys ignored in scope 1:.:.:test.pro:<TRUE>: -# MOC_DIR = "tmp" - -## Scopes: -##################################################################### - -qt_internal_extend_target(tst_qtcpserver CONDITION WIN32 - PUBLIC_LIBRARIES - ws2_32 -) - -#### Keys ignored in scope 6:.:.:test.pro:LINUX: -# QT_TEST_SERVER_LIST = "danted" "cyrus" "squid" "ftp-proxy" diff --git a/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt index 74aed77c95..55615bbae1 100644 --- a/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt @@ -1,28 +1,27 @@ -# Generated from test.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qtcpserver Test: ##################################################################### qt_internal_add_test(tst_qtcpserver - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qtcpserver.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Network - QT_TEST_SERVER_LIST "danted" "cyrus" "squid" "ftp-proxy" # special case + QT_TEST_SERVER_LIST "danted" "cyrus" "squid" "ftp-proxy" ) -#### Keys ignored in scope 1:.:.:test.pro:<TRUE>: -# MOC_DIR = "tmp" +add_dependencies(tst_qtcpserver + crashingServer +) ## Scopes: ##################################################################### qt_internal_extend_target(tst_qtcpserver CONDITION WIN32 - PUBLIC_LIBRARIES + LIBRARIES ws2_32 ) - -#### Keys ignored in scope 6:.:.:test.pro:LINUX: -# 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 deleted file mode 100644 index 491ff28cdc..0000000000 --- a/tests/auto/network/socket/qtcpserver/test/test.pro +++ /dev/null @@ -1,24 +0,0 @@ -CONFIG += testcase -SOURCES += ../tst_qtcpserver.cpp - -win32: QMAKE_USE += ws2_32 - -TARGET = tst_qtcpserver - -win32 { - CONFIG(debug, debug|release) { - TARGET = ../debug/tst_qtcpserver -} else { - TARGET = ../release/tst_qtcpserver - } -} - -QT = core network testlib - -MOC_DIR=tmp - -# 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 cyrus squid ftp-proxy -} |