From 5acc32361ee643dc7b74671f57ee92ae8076df3d Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 12 Nov 2019 17:55:45 +0100 Subject: Regenerate tests/auto/network/access Change-Id: I18839ef583336fa2fa42cb4325fdb007675df213 Reviewed-by: Simon Hausmann --- tests/auto/network/access/hpack/CMakeLists.txt | 2 -- tests/auto/network/access/hsts/CMakeLists.txt | 2 -- tests/auto/network/access/http2/CMakeLists.txt | 4 ---- .../network/access/qabstractnetworkcache/CMakeLists.txt | 8 ++------ tests/auto/network/access/qftp/CMakeLists.txt | 7 +++++-- .../network/access/qhttpnetworkconnection/CMakeLists.txt | 7 +++++-- tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt | 7 +++++-- .../network/access/qnetworkaccessmanager/CMakeLists.txt | 4 ---- .../network/access/qnetworkcachemetadata/CMakeLists.txt | 4 ---- tests/auto/network/access/qnetworkcookie/CMakeLists.txt | 4 ---- tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt | 4 ---- tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt | 4 ---- .../network/access/qnetworkreply/echo/.prev_CMakeLists.txt | 10 ++++++++++ .../auto/network/access/qnetworkreply/test/CMakeLists.txt | 14 +++++++------- tests/auto/network/access/qnetworkrequest/CMakeLists.txt | 4 ---- 15 files changed, 34 insertions(+), 51 deletions(-) create mode 100644 tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt (limited to 'tests') diff --git a/tests/auto/network/access/hpack/CMakeLists.txt b/tests/auto/network/access/hpack/CMakeLists.txt index 104b2830f6..531246ecf0 100644 --- a/tests/auto/network/access/hpack/CMakeLists.txt +++ b/tests/auto/network/access/hpack/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_hpack - GUI SOURCES tst_hpack.cpp LIBRARIES @@ -16,5 +15,4 @@ add_qt_test(tst_hpack ) #### Keys ignored in scope 1:.:.:hpack.pro:: -# CONFIG = "testcase" "parallel_test" "c++11" # TEMPLATE = "app" diff --git a/tests/auto/network/access/hsts/CMakeLists.txt b/tests/auto/network/access/hsts/CMakeLists.txt index a943d78074..f2d09a6395 100644 --- a/tests/auto/network/access/hsts/CMakeLists.txt +++ b/tests/auto/network/access/hsts/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_qhsts - GUI SOURCES tst_qhsts.cpp LIBRARIES @@ -16,5 +15,4 @@ add_qt_test(tst_qhsts ) #### Keys ignored in scope 1:.:.:hsts.pro:: -# CONFIG = "testcase" "parallel_test" "c++11" # TEMPLATE = "app" diff --git a/tests/auto/network/access/http2/CMakeLists.txt b/tests/auto/network/access/http2/CMakeLists.txt index 0dff68cb27..082da570e7 100644 --- a/tests/auto/network/access/http2/CMakeLists.txt +++ b/tests/auto/network/access/http2/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_test(tst_http2 - GUI SOURCES ../../../../shared/emulationdetector.h http2srv.cpp http2srv.h @@ -20,6 +19,3 @@ add_qt_test(tst_http2 PUBLIC_LIBRARIES Qt::Network ) - -#### Keys ignored in scope 1:.:.:http2.pro:: -# CONFIG = "testcase" "parallel_test" "c++11" diff --git a/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt b/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt index a4708b7606..07128e40bb 100644 --- a/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt +++ b/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt @@ -5,15 +5,12 @@ ##################################################################### # Collect test data - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "tests/*") + tests/*) list(APPEND test_data ${test_data_glob}) add_qt_test(tst_qabstractnetworkcache - GUI SOURCES tst_qabstractnetworkcache.cpp PUBLIC_LIBRARIES @@ -22,5 +19,4 @@ add_qt_test(tst_qabstractnetworkcache ) #### Keys ignored in scope 1:.:.:qabstractnetworkcache.pro:: -# CONFIG = "testcase" "unsupported/testserver" # QT_TEST_SERVER_LIST = "apache2" diff --git a/tests/auto/network/access/qftp/CMakeLists.txt b/tests/auto/network/access/qftp/CMakeLists.txt index 55564e6fba..4c706febdd 100644 --- a/tests/auto/network/access/qftp/CMakeLists.txt +++ b/tests/auto/network/access/qftp/CMakeLists.txt @@ -1,11 +1,14 @@ # Generated from qftp.pro. +if(NOT QT_FEATURE_private_tests) + return() +endif() + ##################################################################### ## tst_qftp Test: ##################################################################### add_qt_test(tst_qftp - GUI SOURCES tst_qftp.cpp LIBRARIES @@ -15,5 +18,5 @@ add_qt_test(tst_qftp ) #### Keys ignored in scope 1:.:.:qftp.pro:: -# CONFIG = "testcase" "unsupported/testserver" # QT_TEST_SERVER_LIST = "vsftpd" "ftp-proxy" "squid" "danted" +# _REQUIREMENTS = "qtConfig(private_tests)" diff --git a/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt b/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt index 04fff87674..b1b2059952 100644 --- a/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt +++ b/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt @@ -1,11 +1,14 @@ # Generated from qhttpnetworkconnection.pro. +if(NOT QT_FEATURE_private_tests) + return() +endif() + ##################################################################### ## tst_qhttpnetworkconnection Test: ##################################################################### add_qt_test(tst_qhttpnetworkconnection - GUI SOURCES tst_qhttpnetworkconnection.cpp LIBRARIES @@ -16,5 +19,5 @@ add_qt_test(tst_qhttpnetworkconnection ) #### Keys ignored in scope 1:.:.:qhttpnetworkconnection.pro:: -# CONFIG = "testcase" "unsupported/testserver" # QT_TEST_SERVER_LIST = "apache2" +# _REQUIREMENTS = "qtConfig(private_tests)" diff --git a/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt b/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt index bbc1922fdd..c381ec7b3b 100644 --- a/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt +++ b/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt @@ -1,11 +1,14 @@ # Generated from qhttpnetworkreply.pro. +if(NOT QT_FEATURE_private_tests) + return() +endif() + ##################################################################### ## tst_qhttpnetworkreply Test: ##################################################################### add_qt_test(tst_qhttpnetworkreply - GUI SOURCES tst_qhttpnetworkreply.cpp LIBRARIES @@ -16,4 +19,4 @@ add_qt_test(tst_qhttpnetworkreply ) #### Keys ignored in scope 1:.:.:qhttpnetworkreply.pro:: -# CONFIG = "testcase" +# _REQUIREMENTS = "qtConfig(private_tests)" diff --git a/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt b/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt index a5eda647d9..4b58c449c6 100644 --- a/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt @@ -5,12 +5,8 @@ ##################################################################### add_qt_test(tst_qnetworkaccessmanager - GUI SOURCES tst_qnetworkaccessmanager.cpp PUBLIC_LIBRARIES Qt::Network ) - -#### Keys ignored in scope 1:.:.:qnetworkaccessmanager.pro:: -# CONFIG = "testcase" diff --git a/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt b/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt index 8867e79f68..08e80d8e0d 100644 --- a/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt @@ -5,12 +5,8 @@ ##################################################################### add_qt_test(tst_qnetworkcachemetadata - GUI SOURCES tst_qnetworkcachemetadata.cpp PUBLIC_LIBRARIES Qt::Network ) - -#### Keys ignored in scope 1:.:.:qnetworkcachemetadata.pro:: -# CONFIG = "testcase" diff --git a/tests/auto/network/access/qnetworkcookie/CMakeLists.txt b/tests/auto/network/access/qnetworkcookie/CMakeLists.txt index 0820f7fdd8..ab90a61bb3 100644 --- a/tests/auto/network/access/qnetworkcookie/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkcookie/CMakeLists.txt @@ -5,12 +5,8 @@ ##################################################################### add_qt_test(tst_qnetworkcookie - GUI SOURCES tst_qnetworkcookie.cpp PUBLIC_LIBRARIES Qt::Network ) - -#### Keys ignored in scope 1:.:.:qnetworkcookie.pro:: -# CONFIG = "testcase" diff --git a/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt b/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt index d7302db404..a9296cf3f0 100644 --- a/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt @@ -8,7 +8,6 @@ list(APPEND test_data "parser.json") add_qt_test(tst_qnetworkcookiejar - GUI SOURCES tst_qnetworkcookiejar.cpp LIBRARIES @@ -18,6 +17,3 @@ add_qt_test(tst_qnetworkcookiejar Qt::Network TESTDATA ${test_data} ) - -#### Keys ignored in scope 1:.:.:qnetworkcookiejar.pro:: -# CONFIG = "testcase" diff --git a/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt b/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt index 0d50ab6d21..b206686139 100644 --- a/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt @@ -5,12 +5,8 @@ ##################################################################### add_qt_test(tst_qnetworkdiskcache - GUI SOURCES tst_qnetworkdiskcache.cpp PUBLIC_LIBRARIES Qt::Network ) - -#### Keys ignored in scope 1:.:.:qnetworkdiskcache.pro:: -# CONFIG = "testcase" diff --git a/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt b/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt new file mode 100644 index 0000000000..e43272d7e8 --- /dev/null +++ b/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt @@ -0,0 +1,10 @@ +# Generated from echo.pro. + +##################################################################### +## echo Binary: +##################################################################### + +add_qt_executable(echo + SOURCES + main.cpp +) diff --git a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt index c92342c115..97d0da3d34 100644 --- a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt @@ -9,18 +9,15 @@ list(APPEND test_data "../empty") list(APPEND test_data "../rfc3252.txt") list(APPEND test_data "../resource") list(APPEND test_data "../bigfile") - -file(GLOB test_data_glob - LIST_DIRECTORIES true +file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "../*.jpg") + ../*.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") add_qt_test(tst_qnetworkreply - GUI SOURCES ../../../../../shared/emulationdetector.h ../tst_qnetworkreply.cpp @@ -38,18 +35,21 @@ add_qt_test(tst_qnetworkreply set_source_files_properties("../resource" PROPERTIES QT_RESOURCE_ALIAS "resource" ) +set(qnetworkreply_resource_files + "resource" +) + add_qt_resource(tst_qnetworkreply "qnetworkreply" PREFIX "/" BASE ".." FILES - resource + ${qnetworkreply_resource_files} ) #### Keys ignored in scope 1:.:.:test.pro:: -# CONFIG = "testcase" "-debug_and_release_target" "unsupported/testserver" # QT_FOR_CONFIG = "gui-private" # QT_TEST_SERVER_LIST = "vsftpd" "apache2" "ftp-proxy" "danted" "squid" # testcase.timeout = "600" diff --git a/tests/auto/network/access/qnetworkrequest/CMakeLists.txt b/tests/auto/network/access/qnetworkrequest/CMakeLists.txt index 3bf1d3f560..f089c5a43e 100644 --- a/tests/auto/network/access/qnetworkrequest/CMakeLists.txt +++ b/tests/auto/network/access/qnetworkrequest/CMakeLists.txt @@ -5,12 +5,8 @@ ##################################################################### add_qt_test(tst_qnetworkrequest - GUI SOURCES tst_qnetworkrequest.cpp PUBLIC_LIBRARIES Qt::Network ) - -#### Keys ignored in scope 1:.:.:qnetworkrequest.pro:: -# CONFIG = "testcase" -- cgit v1.2.3