From b076e84a7f467f90bc454c7c88f00bfdcc0ed6ef Mon Sep 17 00:00:00 2001
From: Tatiana Borisova <tatiana.borisova@qt.io>
Date: Wed, 22 Dec 2021 18:14:15 +0200
Subject: [PATCH] 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>
---
 .../corelib/serialization/json/CMakeLists.txt   |  2 +-
 .../qtextstream/qtextstream_integrity.qrc       |  7 +++++++
 .../qtextstream/test/CMakeLists.txt             | 17 ++++++++++++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 tests/auto/corelib/serialization/qtextstream/qtextstream_integrity.qrc

diff --git a/tests/auto/corelib/serialization/json/CMakeLists.txt b/tests/auto/corelib/serialization/json/CMakeLists.txt
index f8e209e620..77d15bedc3 100644
--- a/tests/auto/corelib/serialization/json/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/json/CMakeLists.txt
@@ -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"
diff --git a/tests/auto/corelib/serialization/qtextstream/qtextstream_integrity.qrc b/tests/auto/corelib/serialization/qtextstream/qtextstream_integrity.qrc
new file mode 100644
index 0000000000..620fddcd45
--- /dev/null
+++ b/tests/auto/corelib/serialization/qtextstream/qtextstream_integrity.qrc
@@ -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>
diff --git a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt
index b9094287f7..cb48aed16c 100644
--- a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt
@@ -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
 )