aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmltest
diff options
context:
space:
mode:
authorCharles Yin <charles.yin@nokia.com>2011-10-10 11:30:15 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-10 05:47:52 +0200
commit08d8fe791bd032f030db202df243160fca486bcf (patch)
tree9f45add09a3c5b25576c9cc3ad86883eecdc588e /src/qmltest
parentd0f118d311ec7d051360fb406f5daada2bf4fba7 (diff)
make it possible to run single qml test case file by passing a tst_*.qml file to -input option
Change-Id: I8376ca0ae23d4366d69e0e7f3c95593ba54fc71d Reviewed-on: http://codereview.qt-project.org/6273 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
Diffstat (limited to 'src/qmltest')
-rw-r--r--src/qmltest/quicktest.cpp23
1 files changed, 14 insertions, 9 deletions
diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp
index 641d7e045a..862da0ca05 100644
--- a/src/qmltest/quicktest.cpp
+++ b/src/qmltest/quicktest.cpp
@@ -147,16 +147,21 @@ int quick_test_main(int argc, char **argv, const char *name, quick_test_viewport
if (testPath.isEmpty())
testPath = QLatin1String(".");
- // Scan the test data directory recursively, looking for "tst_*.qml" files.
- QStringList filters;
- filters += QLatin1String("tst_*.qml");
QStringList files;
- QDirIterator iter(testPath, filters, QDir::Files,
- QDirIterator::Subdirectories |
- QDirIterator::FollowSymlinks);
- while (iter.hasNext())
- files += iter.next();
- files.sort();
+
+ if (testPath.endsWith(QLatin1String(".qml")) && QFileInfo(testPath).isFile()) {
+ files << testPath;
+ } else {
+ // Scan the test data directory recursively, looking for "tst_*.qml" files.
+ QStringList filters;
+ filters += QLatin1String("tst_*.qml");
+ QDirIterator iter(testPath, filters, QDir::Files,
+ QDirIterator::Subdirectories |
+ QDirIterator::FollowSymlinks);
+ while (iter.hasNext())
+ files += iter.next();
+ files.sort();
+ }
// Bail out if we didn't find any test cases.
if (files.isEmpty()) {