diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-04-08 06:26:11 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-04-08 06:26:11 (GMT) |
| commit | 5e9fd297dc7fdc0a96809d3533e6fada4a31fb62 (patch) | |
| tree | d52419cd737ac09defcdc8714495028ffb86c077 /tests | |
| parent | 942a605a52dbbd6dfa824e3b76e37576c7d79f6e (diff) | |
| download | Qt-5e9fd297dc7fdc0a96809d3533e6fada4a31fb62.zip Qt-5e9fd297dc7fdc0a96809d3533e6fada4a31fb62.tar.gz Qt-5e9fd297dc7fdc0a96809d3533e6fada4a31fb62.tar.bz2 | |
Add running of examples to quality gate.
Fix broken examples too.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/declarative.pro | 3 | ||||
| -rw-r--r-- | tests/auto/declarative/examples/tst_examples.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index 11d7c13..5441311 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -1,5 +1,6 @@ TEMPLATE = subdirs SUBDIRS += \ + examples \ graphicswidgets \ # Cover parserstress \ # Cover qmetaobjectbuilder \ # Cover @@ -62,7 +63,7 @@ SUBDIRS += \ qdeclarativeimageprovider \ # Cover qdeclarativestyledtext \ # Cover sql \ # Cover - qmlvisual + qmlvisual # Cover contains(QT_CONFIG, webkit) { SUBDIRS += \ diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp index 678dd59..dbd1f92 100644 --- a/tests/auto/declarative/examples/tst_examples.cpp +++ b/tests/auto/declarative/examples/tst_examples.cpp @@ -185,10 +185,10 @@ void tst_examples::examples() QFileInfo fi(file); QFileInfo dir(fi.path()); - QString script = "data/"+dir.baseName()+"/"+fi.baseName(); + QString script = SRCDIR "/data/"+dir.baseName()+"/"+fi.baseName(); QFileInfo testdata(script+".qml"); QStringList arguments; - arguments << "-script" << (testdata.exists() ? script : QLatin1String("data/dummytest")) + arguments << "-script" << (testdata.exists() ? script : QLatin1String(SRCDIR "/data/dummytest")) << "-scriptopts" << "play,testerror,exitoncomplete,exitonfailure" << file; QProcess p; |