summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/thread/qthreadpool/BLACKLIST
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-02-08 14:27:19 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2019-02-08 14:27:19 +0000
commit26ebdeff75d9f0f7b1ca2f82c35d7eaa013c0982 (patch)
tree88626bb5c88436b0e206907f15224bb035481f6b /tests/auto/corelib/thread/qthreadpool/BLACKLIST
parent30178a22ffde5d216a350910668df0d906aced3b (diff)
parentfbfacd33be482fa3cf0aa5cffaf7006d538a2f92 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/staging/5.13
Diffstat (limited to 'tests/auto/corelib/thread/qthreadpool/BLACKLIST')
-rw-r--r--tests/auto/corelib/thread/qthreadpool/BLACKLIST1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/corelib/thread/qthreadpool/BLACKLIST b/tests/auto/corelib/thread/qthreadpool/BLACKLIST
index 1c392ce96c..fc49731687 100644
--- a/tests/auto/corelib/thread/qthreadpool/BLACKLIST
+++ b/tests/auto/corelib/thread/qthreadpool/BLACKLIST
@@ -1,2 +1,3 @@
[expiryTimeoutRace]
osx
+linux