diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-02-10 20:21:30 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2022-02-11 21:54:44 +0100 |
| commit | 815bc61626825ec5572d642e6baaec9158d81044 (patch) | |
| tree | 372bf9774d10aaa09238dd43866ded06cb43fa14 /tests/auto/corelib/serialization/json | |
| parent | fdf5d11ff6f3f5034d7d7f7664f4cc76deb26ef5 (diff) | |
Cleanup tests that add test data to resources explicitly
Remove Integrity and Android specific code that explicitly adds
test data to the resource files. qt_internal_add_test functions
implicitly adds test data to resources for Android and Integrity
platforms by default.
Change-Id: Ia1d58755b47442e1953462e38606f70fec262368
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto/corelib/serialization/json')
| -rw-r--r-- | tests/auto/corelib/serialization/json/CMakeLists.txt | 37 |
1 files changed, 11 insertions, 26 deletions
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 |