diff options
author | Tatiana Borisova <tatiana.borisova@qt.io> | 2021-12-10 16:01:55 +0200 |
---|---|---|
committer | Tatiana Borisova <tatiana.borisova@qt.io> | 2021-12-16 19:45:08 +0200 |
commit | 4aea86f5e8f4533a2a7ca9d7c21da8f81118c631 (patch) | |
tree | 5a5399156626eab2c85889ef9c3b08c1293bdee9 /tests | |
parent | 387797e9238c987637acc81baa32b95f9a9d6b12 (diff) |
Fix autotest runtime failures on INTEGRITY
- add test resources to binaries
- link Qt::Gui to tst_qpointer for static build case
Task-number: QTBUG-99123
Pick-to: 6.2 6.3
Change-Id: I311827b9c641eaf9537091b051c15f9fcbcb9f0c
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/corelib/kernel/qmetatype/CMakeLists.txt | 14 | ||||
-rw-r--r-- | tests/auto/corelib/kernel/qmetatype/testdata.qrc | 5 | ||||
-rw-r--r-- | tests/auto/corelib/kernel/qpointer/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/corelib/serialization/qdatastream/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/corelib/text/qbytearray/CMakeLists.txt | 8 | ||||
-rw-r--r-- | tests/auto/corelib/text/qbytearray/testdata.qrc (renamed from tests/auto/corelib/text/qbytearray/android_testdata.qrc) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/text/qchar/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/corelib/text/qstringconverter/CMakeLists.txt | 17 | ||||
-rw-r--r-- | tests/auto/corelib/text/qstringconverter/testdata.qrc | 5 | ||||
-rw-r--r-- | tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt | 2 |
10 files changed, 50 insertions, 7 deletions
diff --git a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt index 195dd81059..ac4fb55813 100644 --- a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt @@ -21,6 +21,20 @@ 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: ##################################################################### diff --git a/tests/auto/corelib/kernel/qmetatype/testdata.qrc b/tests/auto/corelib/kernel/qmetatype/testdata.qrc new file mode 100644 index 0000000000..d3956e4068 --- /dev/null +++ b/tests/auto/corelib/kernel/qmetatype/testdata.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>typeFlags.bin</file> + </qresource> +</RCC> diff --git a/tests/auto/corelib/kernel/qpointer/CMakeLists.txt b/tests/auto/corelib/kernel/qpointer/CMakeLists.txt index cfafc1eb11..55a5e50ee7 100644 --- a/tests/auto/corelib/kernel/qpointer/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qpointer/CMakeLists.txt @@ -7,6 +7,8 @@ qt_internal_add_test(tst_qpointer SOURCES tst_qpointer.cpp + PUBLIC_LIBRARIES + Qt::Gui ) ## Scopes: diff --git a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt index 5795ad3ed3..136ff4ee19 100644 --- a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt @@ -18,7 +18,7 @@ qt_internal_add_test(tst_qdatastream ## Scopes: ##################################################################### -if(ANDROID) +if(ANDROID OR INTEGRITY) # Resources: set(testdata_resource_files "datastream.q42" diff --git a/tests/auto/corelib/text/qbytearray/CMakeLists.txt b/tests/auto/corelib/text/qbytearray/CMakeLists.txt index 57f73f6672..36bbef19a5 100644 --- a/tests/auto/corelib/text/qbytearray/CMakeLists.txt +++ b/tests/auto/corelib/text/qbytearray/CMakeLists.txt @@ -25,16 +25,16 @@ qt_internal_extend_target(tst_qbytearray CONDITION APPLE ${FWFoundation} ) -if(ANDROID) +if(ANDROID OR INTEGRITY) # Resources: - set(android_testdata_resource_files + set(testdata_resource_files "rfc3252.txt" ) - qt_internal_add_resource(tst_qbytearray "android_testdata" + qt_internal_add_resource(tst_qbytearray "testdata" PREFIX "/" FILES - ${android_testdata_resource_files} + ${testdata_resource_files} ) endif() diff --git a/tests/auto/corelib/text/qbytearray/android_testdata.qrc b/tests/auto/corelib/text/qbytearray/testdata.qrc index 5d42f0f627..5d42f0f627 100644 --- a/tests/auto/corelib/text/qbytearray/android_testdata.qrc +++ b/tests/auto/corelib/text/qbytearray/testdata.qrc diff --git a/tests/auto/corelib/text/qchar/CMakeLists.txt b/tests/auto/corelib/text/qchar/CMakeLists.txt index 3cfc31172d..06faffb60e 100644 --- a/tests/auto/corelib/text/qchar/CMakeLists.txt +++ b/tests/auto/corelib/text/qchar/CMakeLists.txt @@ -18,7 +18,7 @@ qt_internal_add_test(tst_qchar ## Scopes: ##################################################################### -if(ANDROID) +if(ANDROID OR INTEGRITY) # Resources: set(testdata_resource_files "data/NormalizationTest.txt" diff --git a/tests/auto/corelib/text/qstringconverter/CMakeLists.txt b/tests/auto/corelib/text/qstringconverter/CMakeLists.txt index 5b5eee953e..f64aaaf8d2 100644 --- a/tests/auto/corelib/text/qstringconverter/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringconverter/CMakeLists.txt @@ -4,7 +4,24 @@ ## tst_qstringconverter Test: ##################################################################### +list(APPEND test_data "utf8.txt") + qt_internal_add_test(tst_qstringconverter SOURCES 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/qstringconverter/testdata.qrc b/tests/auto/corelib/text/qstringconverter/testdata.qrc new file mode 100644 index 0000000000..fe95cdf90d --- /dev/null +++ b/tests/auto/corelib/text/qstringconverter/testdata.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>utf8.txt</file> + </qresource> +</RCC> diff --git a/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt b/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt index d8de1798f3..cea74758cc 100644 --- a/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt +++ b/tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt @@ -19,7 +19,7 @@ qt_internal_add_test(tst_qcryptographichash ## Scopes: ##################################################################### -if(ANDROID) +if(ANDROID OR INTEGRITY) # Resources: set(testdata_resource_files "data/2c1517dad3678f03917f15849b052fd5.md5" |