summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2010-12-03 08:52:03 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2010-12-03 08:52:03 (GMT)
commitd55ea5c4b4d1d80ab94c3ef3a59b15359373c84a (patch)
tree0bd5dcab629a88a0ba1d071632d8b89157a74eb6 /tests
parent2a67cbb031608e73b0e02a12ea26de6d43c9250d (diff)
downloadQt-d55ea5c4b4d1d80ab94c3ef3a59b15359373c84a.zip
Qt-d55ea5c4b4d1d80ab94c3ef3a59b15359373c84a.tar.gz
Qt-d55ea5c4b4d1d80ab94c3ef3a59b15359373c84a.tar.bz2
Do not use openGL on Mac OS X for QML visual tests
It appears to lead to sporadic crashes in the CI system. Task-number: QTBUG-14792
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
index fe23e09..3ca6d93 100644
--- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
+++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
@@ -133,6 +133,9 @@ void tst_qmlvisual::visual()
QFETCH(QString, testdata);
QStringList arguments;
+#ifdef Q_WS_MAC
+ arguments << "-no-opengl";
+#endif
arguments << "-script" << testdata
<< "-scriptopts" << "play,testimages,testerror,testskip,exitoncomplete,exitonfailure"
<< file;
@@ -236,6 +239,9 @@ void action(Mode mode, const QString &file)
QString testdata = tst_qmlvisual::toTestScript(file,mode);
QStringList arguments;
+#ifdef Q_WS_MAC
+ arguments << "-no-opengl";
+#endif
switch (mode) {
case Test:
// Don't run qml