diff options
Diffstat (limited to 'tests/auto/corelib/text')
-rw-r--r-- | tests/auto/corelib/text/CMakeLists.txt | 5 | ||||
-rw-r--r-- | tests/auto/corelib/text/qstring/BLACKLIST | 3 | ||||
-rw-r--r-- | tests/auto/corelib/text/qstringconverter/BLACKLIST | 3 | ||||
-rw-r--r-- | tests/auto/corelib/text/text.pro | 4 |
4 files changed, 14 insertions, 1 deletions
diff --git a/tests/auto/corelib/text/CMakeLists.txt b/tests/auto/corelib/text/CMakeLists.txt index 93efdf2d71..5b53538b9e 100644 --- a/tests/auto/corelib/text/CMakeLists.txt +++ b/tests/auto/corelib/text/CMakeLists.txt @@ -9,7 +9,6 @@ add_subdirectory(qbytedatabuffer) add_subdirectory(qchar) add_subdirectory(qcollator) add_subdirectory(qlatin1string) -add_subdirectory(qlocale) add_subdirectory(qregularexpression) add_subdirectory(qstring) add_subdirectory(qstring_no_cast_from_bytearray) @@ -22,3 +21,7 @@ add_subdirectory(qstringmatcher) add_subdirectory(qstringtokenizer) add_subdirectory(qstringview) add_subdirectory(qtextboundaryfinder) +# QTBUG-87414 # special case +if(NOT ANDROID) + add_subdirectory(qlocale) +endif() diff --git a/tests/auto/corelib/text/qstring/BLACKLIST b/tests/auto/corelib/text/qstring/BLACKLIST new file mode 100644 index 0000000000..767f54e9d0 --- /dev/null +++ b/tests/auto/corelib/text/qstring/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87416 +[append_special_cases] +android diff --git a/tests/auto/corelib/text/qstringconverter/BLACKLIST b/tests/auto/corelib/text/qstringconverter/BLACKLIST new file mode 100644 index 0000000000..0bf1982277 --- /dev/null +++ b/tests/auto/corelib/text/qstringconverter/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87418 +[convertUtf8] +android diff --git a/tests/auto/corelib/text/text.pro b/tests/auto/corelib/text/text.pro index f03f28936a..24645c850c 100644 --- a/tests/auto/corelib/text/text.pro +++ b/tests/auto/corelib/text/text.pro @@ -23,3 +23,7 @@ SUBDIRS = \ qstringtokenizer \ qstringview \ qtextboundaryfinder + +# QTBUG-87414 +android: SUBDIRS -= \ + qlocale |