summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/auto/declarative/declarative.pro3
-rw-r--r--tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp12
2 files changed, 12 insertions, 3 deletions
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index eb74244..6c5a75f 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -59,7 +59,8 @@ SUBDIRS += \
qdeclarativexmlhttprequest \ # Cover
qdeclarativeimageprovider \ # Cover
qdeclarativestyledtext \ # Cover
- sql # Cover
+ sql \ # Cover
+ qmlvisual
contains(QT_CONFIG, webkit) {
SUBDIRS += \
diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
index 78a753e..f87fd29 100644
--- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
+++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
@@ -97,13 +97,21 @@ void tst_qmlvisual::visual_data()
QTest::addColumn<QString>("testdata");
QStringList files;
- files << findQmlFiles(QDir(QT_TEST_SOURCE_DIR));
+ if (qgetenv("RUN_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/reanchor/reanchor.qml";
+ }
+
foreach (const QString &file, files) {
QString testdata = toTestScript(file);
if (testdata.isEmpty())
continue;
-
+
QTest::newRow(file.toLatin1().constData()) << file << testdata;
}
}