diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-11-25 20:23:26 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-26 00:01:15 +0000 |
| commit | 1d30822deaa73df36ecabafda13817f063a9c068 (patch) | |
| tree | 484c1a03cf7c838b291d0dd2be1013570625907a /tests/auto/corelib | |
| parent | e6a37561e371ee98082c493d6451cda0e09d3b24 (diff) | |
Android: exclude faulty qfilesystemwatcher test
Task-number: QTBUG-88508
Change-Id: I11b845e74e599d3bdae4f9490a591893531bc77b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit c7dec2faca476c94a40bd4ac5118915b1a5d9aa8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests/auto/corelib')
| -rw-r--r-- | tests/auto/corelib/io/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/io/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/auto/corelib/io/io.pro | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/corelib/io/.prev_CMakeLists.txt b/tests/auto/corelib/io/.prev_CMakeLists.txt index b9d2954156..1bb6227e42 100644 --- a/tests/auto/corelib/io/.prev_CMakeLists.txt +++ b/tests/auto/corelib/io/.prev_CMakeLists.txt @@ -34,7 +34,7 @@ endif() if(QT_FEATURE_private_tests OR UNIX) add_subdirectory(qfilesystementry) endif() -if(QT_FEATURE_filesystemwatcher) +if(QT_FEATURE_filesystemwatcher AND NOT ANDROID) add_subdirectory(qfilesystemwatcher) endif() if(TARGET Qt::Network) diff --git a/tests/auto/corelib/io/CMakeLists.txt b/tests/auto/corelib/io/CMakeLists.txt index cf014b2b1f..3ec6665335 100644 --- a/tests/auto/corelib/io/CMakeLists.txt +++ b/tests/auto/corelib/io/CMakeLists.txt @@ -34,7 +34,8 @@ endif() if(QT_FEATURE_private_tests OR UNIX) add_subdirectory(qfilesystementry) endif() -if(QT_FEATURE_filesystemwatcher) +# QTBUG-88508 # special case +if(QT_FEATURE_filesystemwatcher AND NOT ANDROID) add_subdirectory(qfilesystemwatcher) endif() if(TARGET Qt::Network) diff --git a/tests/auto/corelib/io/io.pro b/tests/auto/corelib/io/io.pro index 84a4cf0dab..acc1752721 100644 --- a/tests/auto/corelib/io/io.pro +++ b/tests/auto/corelib/io/io.pro @@ -55,6 +55,10 @@ SUBDIRS=\ win32:!qtConfig(private_tests): SUBDIRS -= \ qfilesystementry +# QTBUG-88508 +android: SUBDIRS -= \ + qfilesystemwatcher + !qtConfig(filesystemwatcher): SUBDIRS -= \ qfilesystemwatcher |