From 1d30822deaa73df36ecabafda13817f063a9c068 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 25 Nov 2020 20:23:26 +0200 Subject: [PATCH] Android: exclude faulty qfilesystemwatcher test Task-number: QTBUG-88508 Change-Id: I11b845e74e599d3bdae4f9490a591893531bc77b Reviewed-by: Alexandru Croitor (cherry picked from commit c7dec2faca476c94a40bd4ac5118915b1a5d9aa8) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/corelib/io/.prev_CMakeLists.txt | 2 +- tests/auto/corelib/io/CMakeLists.txt | 3 ++- 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 b9d2954156c..1bb6227e425 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 cf014b2b1f0..3ec66653350 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 84a4cf0dab5..acc1752721c 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