diff options
Diffstat (limited to 'tests/auto/network/socket/qudpsocket/test')
3 files changed, 10 insertions, 83 deletions
diff --git a/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt deleted file mode 100644 index 4c393d67a8..0000000000 --- a/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# Generated from test.pro. - -##################################################################### -## tst_qudpsocket Test: -##################################################################### - -qt_add_test(tst_qudpsocket - SOURCES - ../tst_qudpsocket.cpp - INCLUDE_DIRECTORIES - ../../../../../shared - PUBLIC_LIBRARIES - Qt::Network -) - -#### Keys ignored in scope 1:.:.:test.pro:<TRUE>: -# MOC_DIR = "tmp" -# testcase.timeout = "800" - -## 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 = "../" - -#### Keys ignored in scope 6:.:.:test.pro:LINUX: -# QT_TEST_SERVER_LIST = "danted" "echo" diff --git a/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt index 3da08a0e72..69b62c2f9f 100644 --- a/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt +++ b/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt @@ -1,35 +1,20 @@ -# Generated from test.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qudpsocket Test: ##################################################################### -qt_add_test(tst_qudpsocket - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case +qt_internal_add_test(tst_qudpsocket + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qudpsocket.cpp - INCLUDE_DIRECTORIES - ../../../../../shared - PUBLIC_LIBRARIES + LIBRARIES Qt::Network - QT_TEST_SERVER_LIST "danted" "echo" # special case + Qt::TestPrivate + QT_TEST_SERVER_LIST "danted" "echo" ) -#### Keys ignored in scope 1:.:.:test.pro:<TRUE>: -# MOC_DIR = "tmp" -# testcase.timeout = "800" - -## 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 = "../" - -#### Keys ignored in scope 6:.:.:test.pro:LINUX: -# QT_TEST_SERVER_LIST = "danted" "echo" +if(QT_FEATURE_process) + add_dependencies(tst_qudpsocket clientserver) +endif() diff --git a/tests/auto/network/socket/qudpsocket/test/test.pro b/tests/auto/network/socket/qudpsocket/test/test.pro deleted file mode 100644 index 994b360370..0000000000 --- a/tests/auto/network/socket/qudpsocket/test/test.pro +++ /dev/null @@ -1,25 +0,0 @@ -CONFIG += testcase -testcase.timeout = 800 # this test is slow -SOURCES += ../tst_qudpsocket.cpp -INCLUDEPATH += ../../../../../shared/ -QT = core network testlib - -MOC_DIR=tmp - -win32:debug_and_release { - CONFIG(debug, debug|release) { - DESTDIR = ../debug -} else { - DESTDIR = ../release - } -} else { - DESTDIR = ../ -} - -TARGET = tst_qudpsocket - -# Only on Linux until 'echo' has been added to docker-compose-for-{windows,macOS}.yml and tested -linux { - CONFIG += unsupported/testserver - QT_TEST_SERVER_LIST = danted echo -} |