whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tst_qtextstream / tst_json run time failures on INTEGRITY device 

- add test resources to binaries

Task-number: QTBUG-99123
Pick-to: 6.2 6.3
Change-Id: Ibeed93af43b4f951ca55f044fbfab00d4ab30468
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Tatiana Borisova 2021-12-22 18:14:15 +02:00
parent 3162f04dee
commit b076e84a7f
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ qt_internal_add_test(tst_json
#### Keys ignored in scope 2:.:.:json.pro:NOT ANDROID:
# TESTDATA = "bom.json" "test.json" "test3.json" "test2.json"
if(ANDROID)
if(ANDROID OR INTEGRITY)
# Resources:
set(json_resource_files
"bom.json"

7
tests/auto/corelib/serialization/qtextstream/qtextstream_integrity.qrc Normal file
View File

@ -0,0 +1,7 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/">
<file>rfc3261.txt</file>
<file>task113817.txt</file>
<file>tst_qtextstream.cpp</file>
</qresource>
</RCC>

17
tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt
View File

@ -6,6 +6,7 @@
list(APPEND test_data "../rfc3261.txt")
list(APPEND test_data "../task113817.txt")
list(APPEND test_data "../qtextstream.qrc")
list(APPEND test_data "../qtextstream_integrity.qrc")
list(APPEND test_data "../tst_qtextstream.cpp")
list(APPEND test_data "../resources")
list(APPEND test_data "../BLACKLIST")
@ -35,10 +36,24 @@ 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
qt_internal_extend_target(tst_qtextstream CONDITION builtin_testdata OR INTEGRITY
DEFINES
BUILTIN_TESTDATA
)