summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2017-03-15 11:35:47 +0100
committerLiang Qi <liang.qi@qt.io>2017-03-15 13:11:06 +0000
commit324b1a939bc98e97b05f7a186e91a5ad694bb09b (patch)
tree93904ab73d3418417b8934152e73227cc86f6976
parent893fb5f82f19795c215b52635e74219fbec89d12 (diff)
downloadqtlocation-324b1a939bc98e97b05f7a186e91a5ad694bb09b.tar.gz
Skip Flick autotests altogether on windows 32bit
Apparently these cause a test crash Task-number: QTBUG-59503 Change-Id: I3982eaf68503f791faf25ec4b57f7a592d8a2242 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--tests/auto/declarative_ui/tst_map_flick.qml3
-rw-r--r--tests/plugins/declarativetestplugin/testhelper.h9
2 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/declarative_ui/tst_map_flick.qml b/tests/auto/declarative_ui/tst_map_flick.qml
index 7a58b186..8da712b2 100644
--- a/tests/auto/declarative_ui/tst_map_flick.qml
+++ b/tests/auto/declarative_ui/tst_map_flick.qml
@@ -30,6 +30,7 @@ import QtQuick 2.5
import QtTest 1.0
import QtLocation 5.6
import QtPositioning 5.5
+import QtLocation.Test 5.6
Item {
// General-purpose elements for the test:
@@ -98,6 +99,8 @@ Item {
function init()
{
+ if (Qt.platform.os === "windows" && (LocationTestHelper.x86Bits() === 32))
+ skip("QTBUG-59503")
map.gesture.acceptedGestures = MapGestureArea.PanGesture | MapGestureArea.FlickGesture;
map.gesture.enabled = true
map.gesture.panEnabled = true
diff --git a/tests/plugins/declarativetestplugin/testhelper.h b/tests/plugins/declarativetestplugin/testhelper.h
index c6d9f3b3..3b9f376e 100644
--- a/tests/plugins/declarativetestplugin/testhelper.h
+++ b/tests/plugins/declarativetestplugin/testhelper.h
@@ -38,6 +38,7 @@
#include <QSignalSpy>
#include <QQuickItem>
#include <QQuickWindow>
+#include <QSysInfo>
QT_BEGIN_NAMESPACE
@@ -51,6 +52,14 @@ public:
QSignalSpy spy(item->window(), &QQuickWindow::afterAnimating);
return spy.wait(timeout);
}
+
+ Q_INVOKABLE int x86Bits() const
+ {
+ if ( QSysInfo::currentCpuArchitecture() == "x86_64" )
+ return 64;
+ else
+ return 32;
+ }
};
QT_END_NAMESPACE