diff options
Diffstat (limited to 'tests/auto/network/access/qnetworkreply/test')
3 files changed, 12 insertions, 103 deletions
diff --git a/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt deleted file mode 100644 index 19b430b159..0000000000 --- a/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt +++ /dev/null @@ -1,59 +0,0 @@ -# Generated from test.pro. - -##################################################################### -## tst_qnetworkreply Test: -##################################################################### - -# Collect test data -list(APPEND test_data "../empty") -list(APPEND test_data "../rfc3252.txt") -list(APPEND test_data "../resource") -list(APPEND test_data "../bigfile") -file(GLOB_RECURSE test_data_glob - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - ../*.jpg) -list(APPEND test_data ${test_data_glob}) -list(APPEND test_data "../certs") -list(APPEND test_data "../index.html") -list(APPEND test_data "../smb-file.txt") - -qt_add_test(tst_qnetworkreply - SOURCES - ../../../../../shared/emulationdetector.h - ../tst_qnetworkreply.cpp - INCLUDE_DIRECTORIES - ../../../../../shared - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate - TESTDATA ${test_data} -) - -# Resources: -set_source_files_properties("../resource" - PROPERTIES QT_RESOURCE_ALIAS "resource" -) -set(qnetworkreply_resource_files - "resource" -) - -qt_add_resource(tst_qnetworkreply "qnetworkreply" - PREFIX - "/" - BASE - ".." - FILES - ${qnetworkreply_resource_files} -) - - -#### Keys ignored in scope 1:.:.:test.pro:<TRUE>: -# QT_FOR_CONFIG = "gui-private" -# QT_TEST_SERVER_LIST = "vsftpd" "apache2" "ftp-proxy" "danted" "squid" -# testcase.timeout = "600" - -## Scopes: -##################################################################### - -#### Keys ignored in scope 2:.:.:test.pro:NOT ANDROID: -# TEST_HELPER_INSTALLS = "../echo/echo" diff --git a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt index 24f264703f..fa353b2769 100644 --- a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from test.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qnetworkreply Test: @@ -17,29 +18,27 @@ list(APPEND test_data "../certs") list(APPEND test_data "../index.html") list(APPEND test_data "../smb-file.txt") -qt_add_test(tst_qnetworkreply - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case +qt_internal_add_test(tst_qnetworkreply + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES - ../../../../../shared/emulationdetector.h ../tst_qnetworkreply.cpp - INCLUDE_DIRECTORIES - ../../../../../shared - PUBLIC_LIBRARIES + ../data/gzip.rcc.cpp + ../data/zstandard.rcc.cpp + LIBRARIES Qt::CorePrivate Qt::NetworkPrivate TESTDATA ${test_data} - QT_TEST_SERVER_LIST "vsftpd" "apache2" "ftp-proxy" "danted" "squid" # special case + QT_TEST_SERVER_LIST "vsftpd" "apache2" "ftp-proxy" "danted" "squid" + BUNDLE_ANDROID_OPENSSL_LIBS ) +add_dependencies(tst_qnetworkreply echo) # Resources: -set_source_files_properties("../resource" - PROPERTIES QT_RESOURCE_ALIAS "resource" -) set(qnetworkreply_resource_files - "resource" + "../resource" ) -qt_add_resource(tst_qnetworkreply "qnetworkreply" +qt_internal_add_resource(tst_qnetworkreply "qnetworkreply" PREFIX "/" BASE @@ -47,15 +46,3 @@ qt_add_resource(tst_qnetworkreply "qnetworkreply" FILES ${qnetworkreply_resource_files} ) - - -#### Keys ignored in scope 1:.:.:test.pro:<TRUE>: -# QT_FOR_CONFIG = "gui-private" -# QT_TEST_SERVER_LIST = "vsftpd" "apache2" "ftp-proxy" "danted" "squid" -# testcase.timeout = "600" - -## Scopes: -##################################################################### - -#### Keys ignored in scope 2:.:.:test.pro:NOT ANDROID: -# TEST_HELPER_INSTALLS = "../echo/echo" diff --git a/tests/auto/network/access/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro deleted file mode 100644 index bf09a99d27..0000000000 --- a/tests/auto/network/access/qnetworkreply/test/test.pro +++ /dev/null @@ -1,19 +0,0 @@ -CONFIG += testcase -testcase.timeout = 600 # this test is slow -CONFIG -= debug_and_release_target -INCLUDEPATH += ../../../../../shared/ -HEADERS += ../../../../../shared/emulationdetector.h -SOURCES += ../tst_qnetworkreply.cpp -TARGET = tst_qnetworkreply - -QT = core-private network-private testlib -QT_FOR_CONFIG += gui-private -RESOURCES += ../qnetworkreply.qrc - -TESTDATA += ../empty ../rfc3252.txt ../resource ../bigfile ../*.jpg ../certs \ - ../index.html ../smb-file.txt - -!android: TEST_HELPER_INSTALLS = ../echo/echo - -CONFIG += unsupported/testserver -QT_TEST_SERVER_LIST = vsftpd apache2 ftp-proxy danted squid |