Add a stand-alone test runner for QML unit tests

Usage: "qmltestrunner -input testdir" where "testdir" contains
the QML unit tests to be executed.

4 files changed, 90 insertions, 1 deletions

diff --git a/src/qmltestrunner/main.cpp b/src/qmltestrunner/main.cpp
new file mode 100644
index 0000000..47f34ee
--- /dev/null
+++ b/src/qmltestrunner/main.cpp
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtQuickTest/quicktest.h>
+#include <QtCore/qstring.h>
+#ifdef QT_OPENGL_LIB
+#include <QtOpenGL/qgl.h>
+#endif
+
+#ifdef QT_OPENGL_LIB
+
+static QWidget *qmltestrunner_create_gl_viewport()
+{
+    return new QGLWidget();
+}
+
+#endif
+
+int main(int argc, char **argv)
+{
+#ifdef QT_OPENGL_LIB
+    bool isOpenGL = false;
+    for (int index = 1; index < argc; ++index) {
+        if (strcmp(argv[index], "-opengl") == 0) {
+            isOpenGL = true;
+            break;
+        }
+    }
+    if (isOpenGL) {
+        return quick_test_main(argc, argv, "qmltestrunner",
+                               qmltestrunner_create_gl_viewport, ".");
+    } else
+#endif
+    {
+        return quick_test_main(argc, argv, "qmltestrunner", 0, ".");
+    }
+}
diff --git a/src/qmltestrunner/qmltestrunner.pro b/src/qmltestrunner/qmltestrunner.pro
new file mode 100644
index 0000000..e954754
--- /dev/null
+++ b/src/qmltestrunner/qmltestrunner.pro
@@ -0,0 +1,12 @@
+TEMPLATE = app
+TARGET = qmltestrunner
+CONFIG += warn_on
+SOURCES += main.cpp
+include(../quicktestlib/quicktestlib_dep.pri)
+
+contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) {
+    QT += opengl
+}
+
+target.path = $$[QT_INSTALL_BINS]
+INSTALLS += target
diff --git a/src/quicktestlib/quicktest.cpp b/src/quicktestlib/quicktest.cpp
index 29eaa2d..ce00cde 100644
--- a/src/quicktestlib/quicktest.cpp
+++ b/src/quicktestlib/quicktest.cpp
@@ -122,6 +122,8 @@ int quick_test_main(int argc, char **argv, const char *name, quick_test_viewport
         } else if (strcmp(argv[index], "-input") == 0 && (index + 1) < argc) {
             testPath = stripQuotes(QString::fromLocal8Bit(argv[index + 1]));
             index += 2;
+        } else if (strcmp(argv[index], "-opengl") == 0) {
+            ++index;
         } else if (outargc != index) {
             argv[outargc++] = argv[index++];
         } else {
diff --git a/src/src.pro b/src/src.pro
index e323dcf..45c5c6c 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
-SUBDIRS = quicktestlib imports
+SUBDIRS = quicktestlib imports qmltestrunner
 CONFIG += ordered