qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Tatiana Borisova 2021-12-10 16:01:55 +02:00
parent 387797e923
commit 4aea86f5e8
10 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
View File

@ -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:
#####################################################################

5
tests/auto/corelib/kernel/qmetatype/testdata.qrc Normal file
View File

@ -0,0 +1,5 @@
<RCC>
<qresource prefix="/">
<file>typeFlags.bin</file>
</qresource>
</RCC>

2
tests/auto/corelib/kernel/qpointer/CMakeLists.txt
View File

@ -7,6 +7,8 @@
qt_internal_add_test(tst_qpointer
SOURCES
tst_qpointer.cpp
PUBLIC_LIBRARIES
Qt::Gui
)
## Scopes:

2
tests/auto/corelib/serialization/qdatastream/CMakeLists.txt
View File

@ -18,7 +18,7 @@ qt_internal_add_test(tst_qdatastream
## Scopes:
#####################################################################
if(ANDROID)
if(ANDROID OR INTEGRITY)
# Resources:
set(testdata_resource_files
"datastream.q42"

8
tests/auto/corelib/text/qbytearray/CMakeLists.txt
View File

@ -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()

0
tests/auto/corelib/text/qbytearray/android_testdata.qrc → tests/auto/corelib/text/qbytearray/testdata.qrc
View File

2
tests/auto/corelib/text/qchar/CMakeLists.txt
View File

@ -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"

17
tests/auto/corelib/text/qstringconverter/CMakeLists.txt
View File

@ -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()

5
tests/auto/corelib/text/qstringconverter/testdata.qrc Normal file
View File

@ -0,0 +1,5 @@
<RCC>
<qresource prefix="/">
<file>utf8.txt</file>
</qresource>
</RCC>

2
tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt
View File

@ -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"