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/thread | |
| 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/thread')
| -rw-r--r-- | tests/auto/corelib/thread/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/tests/auto/corelib/thread/CMakeLists.txt b/tests/auto/corelib/thread/CMakeLists.txt index 931d8f0c6a..08df798b0b 100644 --- a/tests/auto/corelib/thread/CMakeLists.txt +++ b/tests/auto/corelib/thread/CMakeLists.txt @@ -5,7 +5,9 @@ if(QT_FEATURE_thread) add_subdirectory(qatomicinteger) add_subdirectory(qatomicpointer) add_subdirectory(qresultstore) - add_subdirectory(qfuture) + if(NOT INTEGRITY) + add_subdirectory(qfuture) + endif() add_subdirectory(qfuturesynchronizer) add_subdirectory(qmutex) add_subdirectory(qmutexlocker) @@ -28,11 +30,13 @@ if(QT_FEATURE_thread) # special case end add_subdirectory(qwaitcondition) add_subdirectory(qwritelocker) - add_subdirectory(qpromise) + if(NOT INTEGRITY) + add_subdirectory(qpromise) + endif() endif() # special case begin # QTBUG-87431 -if(TARGET Qt::Concurrent AND NOT ANDROID) +if(TARGET Qt::Concurrent AND NOT ANDROID AND NOT INTEGRITY) add_subdirectory(qfuturewatcher) endif() # special case end diff --git a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp index 40bc815c33..5e079880bd 100644 --- a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp +++ b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp @@ -27,7 +27,9 @@ ****************************************************************************/ #include <QTest> +#if QT_CONFIG(process) #include <QProcess> +#endif #include <QTestEventLoop> #include <qcoreapplication.h> |