aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2016-03-22 08:37:21 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2016-03-22 15:21:43 +0000
commitfaa65aebb2e52cc809248f6cbb86b994ff329285 (patch)
tree8e42096bc97ba7d3dfaf5cea2d7f4ff827490ef1 /tests
parent200c080375280370fd877c447e71a44e08897615 (diff)
tst_swipedelegate: blacklist test_swipeVelocity on OSX
This way the tests are run at least on other platforms. Change-Id: Ibceb60e8069e74a93ee2e5de5c24711e01a91cba Task-number: QTBUG-52003 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/controls/BLACKLIST3
-rw-r--r--tests/auto/controls/data/tst_swipedelegate.qml2
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/controls/BLACKLIST b/tests/auto/controls/BLACKLIST
new file mode 100644
index 00000000..d4e90561
--- /dev/null
+++ b/tests/auto/controls/BLACKLIST
@@ -0,0 +1,3 @@
+# QTBUG-52003
+[SwipeDelegate::test_swipeVelocity]
+osx
diff --git a/tests/auto/controls/data/tst_swipedelegate.qml b/tests/auto/controls/data/tst_swipedelegate.qml
index de5d7862..6fbedeec 100644
--- a/tests/auto/controls/data/tst_swipedelegate.qml
+++ b/tests/auto/controls/data/tst_swipedelegate.qml
@@ -347,8 +347,6 @@ TestCase {
}
function test_swipeVelocity(data) {
- skip("QTBUG-52003");
-
var control = swipeDelegateComponent.createObject(testCase);
verify(control);