diff options
author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-14 15:24:54 +0100 |
---|---|---|
committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 08:16:17 +0000 |
commit | 7c6f763d85c16bb1f3ee1ec8d845696188bef067 (patch) | |
tree | f9c09f63fbffef9ca6cc46d03a0358102e06b942 | |
parent | 89d4f2f13e9bcd9ae40ad51fe043b2838b46e26e (diff) |
Regenerate Tests
Change-Id: I78f1efbec809610bcf6a8224392fa0dc8dbf3b3b
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
24 files changed, 96 insertions, 19 deletions
diff --git a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt index b669361a80..5b8acb7a64 100644 --- a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt @@ -33,7 +33,7 @@ extend_target(tst_qsocketnotifier CONDITION WIN32 extend_target(tst_qsocketnotifier CONDITION QT_FEATURE_reduce_exports AND UNIX SOURCES - ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine.cpp + ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine_p.h ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_p.h ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_unix.cpp ) diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt index 554d51292f..b388bb65cf 100644 --- a/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### add_qt_test(tst_qfactoryloader + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../plugin1/plugininterface1.h ../plugin2/plugininterface2.h diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt index c721aa3a5a..509a88da0c 100644 --- a/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### add_qt_test(tst_qfactoryloader - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../plugin1/plugininterface1.h ../plugin2/plugininterface2.h diff --git a/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt index 250521a8d4..ac6515ba63 100644 --- a/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt @@ -8,6 +8,7 @@ list(APPEND test_data "../library_path/invalid.so") add_qt_test(tst_qlibrary + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qlibrary.cpp TESTDATA ${test_data} diff --git a/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt index d041238bc8..e6086a982f 100644 --- a/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND test_data "../library_path/invalid.so") add_qt_test(tst_qlibrary - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qlibrary.cpp TESTDATA ${test_data} diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt index cf63ce61c9..8bef975168 100644 --- a/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt @@ -9,6 +9,7 @@ list(APPEND test_data "../elftest") list(APPEND test_data "../machtest") add_qt_test(tst_qpluginloader + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../fakeplugin.cpp ../theplugin/plugininterface.h diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt index 85ed763949..8bef975168 100644 --- a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt @@ -9,7 +9,7 @@ list(APPEND test_data "../elftest") list(APPEND test_data "../machtest") add_qt_test(tst_qpluginloader - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../fakeplugin.cpp ../theplugin/plugininterface.h diff --git a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt index a293f87155..2bb2e842e8 100644 --- a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt @@ -10,6 +10,8 @@ list(APPEND test_data "datastream.q42") add_qt_test(tst_qdatastream SOURCES tst_qdatastream.cpp + DEFINES + # -QT_NO_LINKED_LIST # special case remove PUBLIC_LIBRARIES Qt::Gui TESTDATA ${test_data} diff --git a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt index e316e01c16..21ba0d47fb 100644 --- a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt @@ -14,6 +14,7 @@ list(APPEND test_data "../resources") list(APPEND test_data "../BLACKLIST") add_qt_test(tst_qtextstream + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../../../../../shared/emulationdetector.h ../tst_qtextstream.cpp diff --git a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt new file mode 100644 index 0000000000..83d9899b36 --- /dev/null +++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from qdbusabstractinterface.pro. + +##################################################################### +## tst_qdbusabstractinterface Test: +##################################################################### + +add_qt_test(tst_qdbusabstractinterface + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + ../interface.cpp ../interface.h + ../tst_qdbusabstractinterface.cpp + DBUS_INTERFACE_SOURCES + ../org.qtproject.QtDBus.Pinger.xml + DBUS_INTERFACE_FLAGS + "-i" "../interface.h" + PUBLIC_LIBRARIES + Qt::DBus +) diff --git a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/CMakeLists.txt index d79bfa0c2d..3df1ff8177 100644 --- a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/CMakeLists.txt +++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/CMakeLists.txt @@ -3,7 +3,6 @@ ##################################################################### ## tst_qdbusabstractinterface Test: ##################################################################### - # special case begin # this test can not be generated here. It needs to be set up in the # parent directory diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt index caea7b1e64..671403999b 100644 --- a/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt +++ b/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt @@ -1,10 +1,10 @@ # Generated from qmyserver.pro. ##################################################################### -## qmyserver Binary: +## qmyserver_qdbusinterface Binary: ##################################################################### -add_qt_executable(qmyserver +add_qt_executable(qmyserver_qdbusinterface OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../myobject.h diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt index 1418f43828..de633f2aa9 100644 --- a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt +++ b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt @@ -1,13 +1,10 @@ # Generated from qmyserver.pro. ##################################################################### -## qmyserver Binary: +## qmyserver_qdbusinterface Binary: ##################################################################### -# Can't be called qmyserver since the qdbusabstractadaptor test -# already has a executable target named like that, so use -# a different target name and then rename the binary -add_qt_executable(qmyserver_qdbusinterface # special case +add_qt_executable(qmyserver_qdbusinterface OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" NO_INSTALL # special case SOURCES diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt index 783607f615..6f8a6804e1 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### add_qt_test(tst_qdbusmarshall + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../tst_qdbusmarshall.cpp diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt index d78505a53d..84976ee923 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### add_qt_test(tst_qdbusmarshall - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qdbusmarshall.cpp LIBRARIES diff --git a/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt new file mode 100644 index 0000000000..620ef96a5b --- /dev/null +++ b/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt @@ -0,0 +1,24 @@ +# Generated from test.pro. + +##################################################################### +## tst_qclipboard Test: +##################################################################### + +add_qt_test(tst_qclipboard + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" + SOURCES + ../tst_qclipboard.cpp + PUBLIC_LIBRARIES + Qt::Gui +) + +## Scopes: +##################################################################### + +extend_target(tst_qclipboard CONDITION APPLE_OSX + PUBLIC_LIBRARIES + ${FWAppKit} +) + +#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID AND NOT WINRT: +# TEST_HELPER_INSTALLS = "../copier/copier" "../paster/paster" diff --git a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt index 0c9a4683bc..620ef96a5b 100644 --- a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt +++ b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### add_qt_test(tst_qclipboard - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qclipboard.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/bearer/qnetworksession/test/.prev_CMakeLists.txt b/tests/auto/network/bearer/qnetworksession/test/.prev_CMakeLists.txt new file mode 100644 index 0000000000..0df7ce71da --- /dev/null +++ b/tests/auto/network/bearer/qnetworksession/test/.prev_CMakeLists.txt @@ -0,0 +1,30 @@ +# Generated from test.pro. + +##################################################################### +## tst_qnetworksession Test: +##################################################################### + +add_qt_test(tst_qnetworksession + SOURCES + ../../qbearertestcommon.h + tst_qnetworksession.cpp + LIBRARIES + Qt::NetworkPrivate + PUBLIC_LIBRARIES + Qt::Network +) + +## 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:NOT ANDROID AND NOT WINRT: +# TEST_HELPER_INSTALLS = "../lackey/lackey" diff --git a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt index db36c633a4..bb681d9e2f 100644 --- a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt +++ b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt @@ -34,7 +34,7 @@ extend_target(tst_platformsocketengine CONDITION WIN32 extend_target(tst_platformsocketengine CONDITION QT_FEATURE_reduce_exports AND UNIX SOURCES - ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine.cpp + ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine_p.h ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_p.h ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_unix.cpp ) diff --git a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt index 2deeea34d1..8dfa61c5ac 100644 --- a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt +++ b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt @@ -37,7 +37,7 @@ extend_target(tst_qhttpsocketengine CONDITION WIN32 extend_target(tst_qhttpsocketengine CONDITION QT_FEATURE_reduce_exports AND UNIX SOURCES - ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine.cpp + ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine_p.h ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_p.h ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_unix.cpp ) diff --git a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt index aa3be26d9b..41a958a36e 100644 --- a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt +++ b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt @@ -37,7 +37,7 @@ extend_target(tst_qsocks5socketengine CONDITION WIN32 extend_target(tst_qsocks5socketengine CONDITION QT_FEATURE_reduce_exports AND UNIX SOURCES - ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine.cpp + ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine_p.h ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_p.h ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_unix.cpp ) diff --git a/tests/auto/other/macplist/test/CMakeLists.txt b/tests/auto/other/macplist/test/CMakeLists.txt index 8fffde2bb9..3cb8066adf 100644 --- a/tests/auto/other/macplist/test/CMakeLists.txt +++ b/tests/auto/other/macplist/test/CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### add_qt_test(tst_macplist + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_macplist.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/tools/qmake/.prev_CMakeLists.txt b/tests/auto/tools/qmake/.prev_CMakeLists.txt index 4331d87d41..c1367ec18f 100644 --- a/tests/auto/tools/qmake/.prev_CMakeLists.txt +++ b/tests/auto/tools/qmake/.prev_CMakeLists.txt @@ -23,7 +23,7 @@ add_qt_test(tst_qmake #### Keys ignored in scope 2:.:.:qmake.pro:WIN32: # testcase.timeout = "900" -extend_target(tst_qmake CONDITION cross_compile +extend_target(tst_qmake CONDITION CMAKE_CROSSCOMPILING DEFINES QMAKE_CROSS_COMPILED ) diff --git a/tests/auto/tools/qmake/CMakeLists.txt b/tests/auto/tools/qmake/CMakeLists.txt index 38de47f972..994d5d47d1 100644 --- a/tests/auto/tools/qmake/CMakeLists.txt +++ b/tests/auto/tools/qmake/CMakeLists.txt @@ -23,7 +23,7 @@ add_qt_test(tst_qmake #### Keys ignored in scope 2:.:.:qmake.pro:WIN32: # testcase.timeout = "900" -extend_target(tst_qmake CONDITION CMAKE_CROSSCOMPILING # special case +extend_target(tst_qmake CONDITION CMAKE_CROSSCOMPILING DEFINES QMAKE_CROSS_COMPILED ) |