diff options
Diffstat (limited to 'tests/auto/corelib')
11 files changed, 16 insertions, 208 deletions
diff --git a/tests/auto/corelib/io/qiodevice/CMakeLists.txt b/tests/auto/corelib/io/qiodevice/CMakeLists.txt index 2bd6033440..ea799619d3 100644 --- a/tests/auto/corelib/io/qiodevice/CMakeLists.txt +++ b/tests/auto/corelib/io/qiodevice/CMakeLists.txt @@ -14,23 +14,3 @@ qt_internal_add_test(tst_qiodevice Qt::Network TESTDATA ${test_data} ) - -#### Keys ignored in scope 1:.:.:qiodevice.pro:<TRUE>: -# MOC_DIR = "tmp" - -## Scopes: -##################################################################### - -if(ANDROID) - # Resources: - set(android_testdata_resource_files - "tst_qiodevice.cpp" - ) - - qt_internal_add_resource(tst_qiodevice "android_testdata" - PREFIX - "/" - FILES - ${android_testdata_resource_files} - ) -endif() diff --git a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt index a00fb8cb32..80da400032 100644 --- a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt +++ b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt @@ -14,23 +14,3 @@ qt_internal_add_test(tst_qloggingregistry Qt::CorePrivate TESTDATA ${test_data} ) - -#### Keys ignored in scope 1:.:.:qloggingregistry.pro:<TRUE>: -# TEMPLATE = "app" - -## Scopes: -##################################################################### - -if(ANDROID) - # Resources: - set(android_testdata_resource_files - "qtlogging.ini" - ) - - qt_internal_add_resource(tst_qloggingregistry "android_testdata" - PREFIX - "/" - FILES - ${android_testdata_resource_files} - ) -endif() diff --git a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt index ac4fb55813..264c459a89 100644 --- a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt @@ -21,23 +21,6 @@ qt_internal_add_test(tst_qmetatype TESTDATA ${test_data} ) -if(INTEGRITY) - # Resources: - set(testdata_resource_files - "typeFlags.bin" - ) - - qt_internal_add_resource(tst_qmetatype "testdata" - PREFIX - "/" - FILES - ${testdata_resource_files} - ) -endif() - -## Scopes: -##################################################################### - qt_internal_extend_target(tst_qmetatype CONDITION MSVC COMPILE_OPTIONS /bigobj diff --git a/tests/auto/corelib/serialization/json/CMakeLists.txt b/tests/auto/corelib/serialization/json/CMakeLists.txt index 9022ed9f3d..01432873f5 100644 --- a/tests/auto/corelib/serialization/json/CMakeLists.txt +++ b/tests/auto/corelib/serialization/json/CMakeLists.txt @@ -4,39 +4,24 @@ ## tst_json Test: ##################################################################### +set(json_resource_files + "bom.json" + "test.json" + "test2.json" + "test3.json" + "simple.duplicates.json" + "test.duplicates.json" + "test3.duplicates.json" +) + qt_internal_add_test(tst_json SOURCES tst_qtjson.cpp PUBLIC_LIBRARIES Qt::CorePrivate + TESTDATA ${json_resource_files} ) -## Scopes: -##################################################################### - -#### Keys ignored in scope 2:.:.:json.pro:NOT ANDROID: -# TESTDATA = "bom.json" "test.json" "test3.json" "test2.json" - -if(ANDROID OR INTEGRITY) - # Resources: - set(json_resource_files - "bom.json" - "test.json" - "test2.json" - "test3.json" - "simple.duplicates.json" - "test.duplicates.json" - "test3.duplicates.json" - ) - - qt_internal_add_resource(tst_json "json" - PREFIX - "/" - FILES - ${json_resource_files} - ) -endif() - qt_internal_extend_target(tst_json CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion DEFINES QT_NO_DOUBLECONVERSION diff --git a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt index b29088c712..361ababd4c 100644 --- a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt @@ -15,21 +15,3 @@ qt_internal_add_test(tst_qdatastream Qt::Gui TESTDATA ${test_data} ) - -## Scopes: -##################################################################### - -if(ANDROID OR INTEGRITY) - # Resources: - set(testdata_resource_files - "datastream.q42" - "typedef.q5" - ) - - qt_internal_add_resource(tst_qdatastream "testdata" - PREFIX - "/" - FILES - ${testdata_resource_files} - ) -endif() diff --git a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt index cb48aed16c..c0b9752fc5 100644 --- a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt @@ -36,28 +36,6 @@ qt_internal_add_resource(tst_qtextstream "qtextstream" ${qtextstream_resource_files} ) -if(INTEGRITY) -set(qtextstream_resource_files_integrity - "../rfc3261.txt" - "../task113817.txt" - "../tst_qtextstream.cpp" -) - -qt_internal_add_resource(tst_qtextstream "qtextstream_integrity" - PREFIX - "/" - FILES - ${qtextstream_resource_files_integrity} -) -endif() - -## Scopes: - -qt_internal_extend_target(tst_qtextstream CONDITION builtin_testdata OR INTEGRITY - DEFINES - BUILTIN_TESTDATA -) - if(QT_FEATURE_process) - add_dependencies(tst_qtextstream stdinProcess readAllStdinProcess readLineStdinProcess) + add_dependencies(tst_qtextstream stdinProcess readAllStdinProcess readLineStdinProcess) endif() diff --git a/tests/auto/corelib/text/qbytearray/CMakeLists.txt b/tests/auto/corelib/text/qbytearray/CMakeLists.txt index 36bbef19a5..d1a65adcd8 100644 --- a/tests/auto/corelib/text/qbytearray/CMakeLists.txt +++ b/tests/auto/corelib/text/qbytearray/CMakeLists.txt @@ -24,17 +24,3 @@ qt_internal_extend_target(tst_qbytearray CONDITION APPLE PUBLIC_LIBRARIES ${FWFoundation} ) - -if(ANDROID OR INTEGRITY) - # Resources: - set(testdata_resource_files - "rfc3252.txt" - ) - - qt_internal_add_resource(tst_qbytearray "testdata" - PREFIX - "/" - FILES - ${testdata_resource_files} - ) -endif() diff --git a/tests/auto/corelib/text/qchar/CMakeLists.txt b/tests/auto/corelib/text/qchar/CMakeLists.txt index 06faffb60e..e46bb37422 100644 --- a/tests/auto/corelib/text/qchar/CMakeLists.txt +++ b/tests/auto/corelib/text/qchar/CMakeLists.txt @@ -14,20 +14,3 @@ qt_internal_add_test(tst_qchar Qt::CorePrivate TESTDATA ${test_data} ) - -## Scopes: -##################################################################### - -if(ANDROID OR INTEGRITY) - # Resources: - set(testdata_resource_files - "data/NormalizationTest.txt" - ) - - qt_internal_add_resource(tst_qchar "testdata" - PREFIX - "/" - FILES - ${testdata_resource_files} - ) -endif() diff --git a/tests/auto/corelib/text/qstringconverter/CMakeLists.txt b/tests/auto/corelib/text/qstringconverter/CMakeLists.txt index f64aaaf8d2..0e344cc8d7 100644 --- a/tests/auto/corelib/text/qstringconverter/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringconverter/CMakeLists.txt @@ -11,17 +11,3 @@ qt_internal_add_test(tst_qstringconverter tst_qstringconverter.cpp TESTDATA ${test_data} ) - -if(INTEGRITY) - # Resources: - set(testdata_resource_files - "utf8.txt" - ) - - qt_internal_add_resource(tst_qstringconverter "testdata" - PREFIX - "/" - FILES - ${testdata_resource_files} - ) -endif() diff --git a/tests/auto/corelib/text/qtextboundaryfinder/CMakeLists.txt b/tests/auto/corelib/text/qtextboundaryfinder/CMakeLists.txt index 024608dc8d..0db89e91ab 100644 --- a/tests/auto/corelib/text/qtextboundaryfinder/CMakeLists.txt +++ b/tests/auto/corelib/text/qtextboundaryfinder/CMakeLists.txt @@ -5,30 +5,13 @@ ##################################################################### # Collect test data -list(APPEND test_data "data") +file(GLOB_RECURSE test_data + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + data/* +) qt_internal_add_test(tst_qtextboundaryfinder SOURCES tst_qtextboundaryfinder.cpp TESTDATA ${test_data} ) - -## Scopes: -##################################################################### - -if(ANDROID) - # Resources: - set(testdata_resource_files - "data/GraphemeBreakTest.txt" - "data/LineBreakTest.txt" - "data/SentenceBreakTest.txt" - "data/WordBreakTest.txt" - ) - - qt_internal_add_resource(tst_qtextboundaryfinder "testdata" - PREFIX - "/" - FILES - ${testdata_resource_files} - ) -endif() diff --git a/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt b/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt index cea74758cc..c9fe345e66 100644 --- a/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt +++ b/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt @@ -15,21 +15,3 @@ qt_internal_add_test(tst_qcryptographichash tst_qcryptographichash.cpp TESTDATA ${test_data} ) - -## Scopes: -##################################################################### - -if(ANDROID OR INTEGRITY) - # Resources: - set(testdata_resource_files - "data/2c1517dad3678f03917f15849b052fd5.md5" - "data/d41d8cd98f00b204e9800998ecf8427e.md5" - ) - - qt_internal_add_resource(tst_qcryptographichash "testdata" - PREFIX - "/" - FILES - ${testdata_resource_files} - ) -endif() |