summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-03-29 06:20:32 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-03-29 06:21:50 (GMT)
commit8038a6de9fa6ea8405e33fb2d94aa45b1e2c7093 (patch)
tree34b91019cbe4c7c9ed373858aeccb6f3dd02a180 /tests
parent730dc7099f67c42773907c813366dea51e388964 (diff)
downloadQt-8038a6de9fa6ea8405e33fb2d94aa45b1e2c7093.zip
Qt-8038a6de9fa6ea8405e33fb2d94aa45b1e2c7093.tar.gz
Qt-8038a6de9fa6ea8405e33fb2d94aa45b1e2c7093.tar.bz2
Visual test fixes.
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/declarative/qmlvisual/animation/parentAnimation/data/parentAnimation-visual.qml (renamed from tests/auto/declarative/qmlvisual/animation/parentAnimation/data/parentAnimation.qml)0
-rw-r--r--tests/auto/declarative/qmlvisual/animation/parentAnimation/parentAnimation-visual.qml (renamed from tests/auto/declarative/qmlvisual/animation/parentAnimation/parentAnimation.qml)0
-rw-r--r--tests/auto/declarative/qmlvisual/animation/pauseAnimation/data/pauseAnimation-visual.qml (renamed from tests/auto/declarative/qmlvisual/animation/pauseAnimation/data/pauseAnimation.qml)0
-rw-r--r--tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml (renamed from tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation.qml)0
-rw-r--r--tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp8
5 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/declarative/qmlvisual/animation/parentAnimation/data/parentAnimation.qml b/tests/auto/declarative/qmlvisual/animation/parentAnimation/data/parentAnimation-visual.qml
index 5718560..5718560 100644
--- a/tests/auto/declarative/qmlvisual/animation/parentAnimation/data/parentAnimation.qml
+++ b/tests/auto/declarative/qmlvisual/animation/parentAnimation/data/parentAnimation-visual.qml
diff --git a/tests/auto/declarative/qmlvisual/animation/parentAnimation/parentAnimation.qml b/tests/auto/declarative/qmlvisual/animation/parentAnimation/parentAnimation-visual.qml
index 8d0b375..8d0b375 100644
--- a/tests/auto/declarative/qmlvisual/animation/parentAnimation/parentAnimation.qml
+++ b/tests/auto/declarative/qmlvisual/animation/parentAnimation/parentAnimation-visual.qml
diff --git a/tests/auto/declarative/qmlvisual/animation/pauseAnimation/data/pauseAnimation.qml b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/data/pauseAnimation-visual.qml
index 73c6542..73c6542 100644
--- a/tests/auto/declarative/qmlvisual/animation/pauseAnimation/data/pauseAnimation.qml
+++ b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/data/pauseAnimation-visual.qml
diff --git a/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation.qml b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml
index 8830170..8830170 100644
--- a/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation.qml
+++ b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml
diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
index f87fd29..8f1a406 100644
--- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
+++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
@@ -97,12 +97,12 @@ void tst_qmlvisual::visual_data()
QTest::addColumn<QString>("testdata");
QStringList files;
- if (qgetenv("RUN_ALL") != "")
+ if (qgetenv("QMLVISUAL_ALL") != "")
files << findQmlFiles(QDir(QT_TEST_SOURCE_DIR));
else {
//these are tests we think are stable and useful enough to be run by the CI system
- files << QT_TEST_SOURCE_DIR "/animation/pauseAnimation/pauseAnimation.qml";
- files << QT_TEST_SOURCE_DIR "/animation/parentAnimation/parentAnimation.qml";
+ files << QT_TEST_SOURCE_DIR "/animation/pauseAnimation/pauseAnimation-visual.qml";
+ files << QT_TEST_SOURCE_DIR "/animation/parentAnimation/parentAnimation-visual.qml";
files << QT_TEST_SOURCE_DIR "/animation/reanchor/reanchor.qml";
}
@@ -124,7 +124,7 @@ void tst_qmlvisual::visual()
QStringList arguments;
arguments << "-script" << testdata
<< "-scriptopts" << "play,testimages,testerror,exitoncomplete,exitonfailure"
- << file;
+ << file << "-graphicssystem" << "raster";
QProcess p;
p.start(qmlruntime, arguments);
QVERIFY(p.waitForFinished());