aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2020-11-11 20:20:54 +0100
committerShawn Rutledge <shawn.rutledge@qt.io>2020-11-11 23:40:13 +0100
commitb945e1f6f71426099c54e51c5189cb4fbb9d85f4 (patch)
tree4d321c40d77fad340939dcc665f7cc4631de66bc /tests
parent949984b48284b84c4f17f5456745929e3da7fe0b (diff)
Mostly un-blacklist Flickable and MultiPointTouchArea tests
At least they pass again locally. Ubuntu is being problematic still. Task-number: QTBUG-86729 Change-Id: I3085b4070475f52f6e1f37b8455429a5bad08177 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/quick/qquickflickable/BLACKLIST5
-rw-r--r--tests/auto/quick/qquickmultipointtoucharea/BLACKLIST22
2 files changed, 2 insertions, 25 deletions
diff --git a/tests/auto/quick/qquickflickable/BLACKLIST b/tests/auto/quick/qquickflickable/BLACKLIST
deleted file mode 100644
index 39931359b2..0000000000
--- a/tests/auto/quick/qquickflickable/BLACKLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-[nestedSliderUsingTouch]
-macos # QTBUG-86729
-*
-[nestedStopAtBounds] # QTBUG-86729
-*
diff --git a/tests/auto/quick/qquickmultipointtoucharea/BLACKLIST b/tests/auto/quick/qquickmultipointtoucharea/BLACKLIST
index 624e5c29c9..abe504d20c 100644
--- a/tests/auto/quick/qquickmultipointtoucharea/BLACKLIST
+++ b/tests/auto/quick/qquickmultipointtoucharea/BLACKLIST
@@ -1,22 +1,4 @@
[nonOverlapping]
-ubuntu-16.04
-ubuntu-18.04
-opensuse-42.3
-opensuse-leap
-sles
+ubuntu-20.04
[nested]
-ubuntu-16.04
-ubuntu-18.04
-opensuse-42.3
-opensuse-leap
-sles
-* # QTBUG-86729
-[inFlickable]
-macos # QTBUG-86729
-*
-[signalTest]
-macos # QTBUG-86729
-*
-[cancel]
-macos # QTBUG-86729
-*
+ubuntu-20.04