From 2d955428ae04de3f73f653bcc8bd10aff68261dc Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Thu, 19 Mar 2020 13:03:58 +0100 Subject: CMake: Regenerate selftest with latest fixes Change-Id: I7453c2439a62331cdc2d7ffaeafb05cd831191c6 Reviewed-by: Alexandru Croitor --- .../benchlibtickcounter/.prev_CMakeLists.txt | 1 - .../selftests/benchlibtickcounter/CMakeLists.txt | 1 - .../selftests/blacklisted/.prev_CMakeLists.txt | 1 - .../testlib/selftests/blacklisted/CMakeLists.txt | 1 - .../testlib/selftests/pass/.prev_CMakeLists.txt | 15 ++++++++ tests/auto/testlib/selftests/pass/CMakeLists.txt | 1 + .../selftests/signaldumper/.prev_CMakeLists.txt | 1 - .../testlib/selftests/signaldumper/CMakeLists.txt | 1 - .../testlib/selftests/silent/.prev_CMakeLists.txt | 1 - tests/auto/testlib/selftests/silent/CMakeLists.txt | 1 - .../testlib/selftests/test/.prev_CMakeLists.txt | 45 ++++++++++++++++++++++ tests/auto/testlib/selftests/test/CMakeLists.txt | 2 +- 12 files changed, 62 insertions(+), 9 deletions(-) create mode 100644 tests/auto/testlib/selftests/pass/.prev_CMakeLists.txt create mode 100644 tests/auto/testlib/selftests/test/.prev_CMakeLists.txt diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt index 3789558508..ec0981c306 100644 --- a/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_executable(benchlibtickcounter - GUI SOURCES tst_benchlibtickcounter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt index 2c3c3a802a..c55c94c776 100644 --- a/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt @@ -7,7 +7,6 @@ add_qt_executable(benchlibtickcounter NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_benchlibtickcounter.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt index d1eae1a783..9fe9796a79 100644 --- a/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_executable(blacklisted - GUI SOURCES tst_blacklisted.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt b/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt index 9161c9c507..d405512565 100644 --- a/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt +++ b/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt @@ -7,7 +7,6 @@ add_qt_executable(blacklisted NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_blacklisted.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/pass/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/pass/.prev_CMakeLists.txt new file mode 100644 index 0000000000..c65690e7e0 --- /dev/null +++ b/tests/auto/testlib/selftests/pass/.prev_CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from pass.pro. + +##################################################################### +## pass Binary: +##################################################################### + +qt_add_executable(pass + SOURCES + tst_pass.cpp + PUBLIC_LIBRARIES + Qt::Test +) + +## Scopes: +##################################################################### diff --git a/tests/auto/testlib/selftests/pass/CMakeLists.txt b/tests/auto/testlib/selftests/pass/CMakeLists.txt index 3601eaa3d4..424201c5c8 100644 --- a/tests/auto/testlib/selftests/pass/CMakeLists.txt +++ b/tests/auto/testlib/selftests/pass/CMakeLists.txt @@ -19,3 +19,4 @@ qt_add_executable(pass # special case begin qt_apply_testlib_coverage_options(pass) # special case end + diff --git a/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt index e5989ba69e..b3244b899d 100644 --- a/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_executable(signaldumper - GUI SOURCES tst_signaldumper.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt b/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt index f23b8328d7..588325b7a7 100644 --- a/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt +++ b/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt @@ -7,7 +7,6 @@ add_qt_executable(signaldumper NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_signaldumper.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt index ebe7d6e299..113f8aac80 100644 --- a/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_executable(silent - GUI SOURCES tst_silent.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/silent/CMakeLists.txt b/tests/auto/testlib/selftests/silent/CMakeLists.txt index bbb16166b4..c62a590181 100644 --- a/tests/auto/testlib/selftests/silent/CMakeLists.txt +++ b/tests/auto/testlib/selftests/silent/CMakeLists.txt @@ -7,7 +7,6 @@ add_qt_executable(silent NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_silent.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/test/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/test/.prev_CMakeLists.txt new file mode 100644 index 0000000000..02d87aa45b --- /dev/null +++ b/tests/auto/testlib/selftests/test/.prev_CMakeLists.txt @@ -0,0 +1,45 @@ +# Generated from test.pro. + +##################################################################### +## tst_selftests Test: +##################################################################### + +qt_add_test(tst_selftests + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" + SOURCES + ../../../../shared/emulationdetector.h + ../tst_selftests.cpp + INCLUDE_DIRECTORIES + ../../../../shared + PUBLIC_LIBRARIES + Qt::TestPrivate +) + +file(GLOB resource_glob_0 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "../expected_*") +foreach(file IN LISTS resource_glob_0) + set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}") +endforeach() + +# Resources: +set(qmake_expected_files_resource_files + ${resource_glob_0} +) + +qt_add_resource(tst_selftests "qmake_expected_files" + PREFIX + "/" + BASE + "$$PWD/.." + FILES + ${qmake_expected_files_resource_files} +) + + +## Scopes: +##################################################################### + +#### Keys ignored in scope 5:.:.:test.pro:NOT ANDROID AND NOT WINRT AND for(file,SUBPROGRAMS): +# TEST_HELPER_INSTALLS = "../$${file}/$${file}" + +#### Keys ignored in scope 7:.:..:../selftests.pri:TARGET Qt::Gui: +# SUBPROGRAMS = "keyboard" "mouse" diff --git a/tests/auto/testlib/selftests/test/CMakeLists.txt b/tests/auto/testlib/selftests/test/CMakeLists.txt index ef7157a247..986e3cfd2f 100644 --- a/tests/auto/testlib/selftests/test/CMakeLists.txt +++ b/tests/auto/testlib/selftests/test/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### qt_add_test(tst_selftests - GUI OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../../../../shared/emulationdetector.h @@ -59,3 +58,4 @@ qt_add_resource(tst_selftests "qmake_expected_files" # special case begin qt_apply_testlib_coverage_options(tst_selftests) # special case end + -- cgit v1.2.3