diff options
author | Tatiana Borisova <tatiana.borisova@qt.io> | 2021-09-06 10:11:06 +0300 |
---|---|---|
committer | Tatiana Borisova <tatiana.borisova@qt.io> | 2021-09-20 17:29:04 +0300 |
commit | 766904bf5b776a6437ca974efbeb9e99ef13e084 (patch) | |
tree | dd3b536372c65481b9fa42634d713350d77ecfca /tests/auto/corelib/global | |
parent | e6892f38a084e514bf9c501f3045b297f6260714 (diff) |
Compile autotests for Integrity
- process environment/DNS are OFF for INTEGRITY
Task-number: QTBUG-96176
Pick-to: 6.2
Change-Id: I189a97f88c96a428586c31a66b8d250e04482900
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/auto/corelib/global')
-rw-r--r-- | tests/auto/corelib/global/CMakeLists.txt | 9 | ||||
-rw-r--r-- | tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/tests/auto/corelib/global/CMakeLists.txt b/tests/auto/corelib/global/CMakeLists.txt index 080276dbd7..fe63402288 100644 --- a/tests/auto/corelib/global/CMakeLists.txt +++ b/tests/auto/corelib/global/CMakeLists.txt @@ -1,6 +1,7 @@ # Generated from global.pro. - -add_subdirectory(qcompare) +if(NOT INTEGRITY) + add_subdirectory(qcompare) +endif() add_subdirectory(qflags) add_subdirectory(q_func_info) add_subdirectory(qgetputenv) @@ -8,7 +9,9 @@ add_subdirectory(qglobal) add_subdirectory(qnumeric) add_subdirectory(qfloat16) add_subdirectory(qkeycombination) -add_subdirectory(qnativeinterface) +if(NOT INTEGRITY) + add_subdirectory(qnativeinterface) +endif() add_subdirectory(qrandomgenerator) add_subdirectory(qlogging) add_subdirectory(qtendian) diff --git a/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp b/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp index 190df2a555..626c3757da 100644 --- a/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp +++ b/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp @@ -31,7 +31,7 @@ #include <QTest> #include <QReadWriteLock> -#if defined(Q_OS_UNIX) +#if defined(Q_OS_UNIX) && !defined(Q_OS_INTEGRITY) #include <sys/resource.h> #endif @@ -56,7 +56,7 @@ private Q_SLOTS: void tst_QGlobalStatic::initTestCase() { -#if defined(Q_OS_UNIX) +#if defined(Q_OS_UNIX) && !defined(Q_OS_INTEGRITY) // The tests create a lot of threads, which require file descriptors. On systems like // OS X low defaults such as 256 as the limit for the number of simultaneously // open files is not sufficient. |