From 9fc9fefdc9f598f8d223dc6eab533be4d0abc762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 11 Feb 2020 14:52:49 +0100 Subject: Restructure testlib selftest project The use of a single subdirectory only for the test binary, but not the actual source file, just made things harder to discover when looking for the test code. Now all subdirectories are actual sub-tests. Change-Id: Ia3e308ba8d231cc8ead1491b10a34801f76669b0 Reviewed-by: Alexandru Croitor --- tests/auto/testlib/selftests/test/CMakeLists.txt | 61 ------------------------ 1 file changed, 61 deletions(-) delete mode 100644 tests/auto/testlib/selftests/test/CMakeLists.txt (limited to 'tests/auto/testlib/selftests/test/CMakeLists.txt') diff --git a/tests/auto/testlib/selftests/test/CMakeLists.txt b/tests/auto/testlib/selftests/test/CMakeLists.txt deleted file mode 100644 index 986e3cfd2f..0000000000 --- a/tests/auto/testlib/selftests/test/CMakeLists.txt +++ /dev/null @@ -1,61 +0,0 @@ -# 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 - # special case begin - # These lines need to be commented out as they need to be enabled - # COMPILE_OPTIONS - # conditionally - # --cs-exclude-file-abs-wildcard=${QT_SOURCE_TREE}/* - # --cs-include-file-abs-wildcard=*/src/testlib/* - # --cs-mcc - # --cs-mcdc - # LINK_OPTIONS - # "$$COVERAGE_OPTIONS" - # special case end -) - -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 - "${CMAKE_CURRENT_SOURCE_DIR}" # special case - 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" - -# special case begin -qt_apply_testlib_coverage_options(tst_selftests) -# special case end - -- cgit v1.2.3