diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-11-04 13:38:44 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-04 08:19:17 +0100 |
| commit | e3a8c165eabe139d71a762089ab396e5b492c70b (patch) | |
| tree | 16d9960d2d20d65e0a5d1becc181c0a7b095d0aa /tests/auto/auto.pro | |
| parent | 7dfb883df639f8d80cec7bd2c51eb37561bc4522 (diff) | |
Rearrange the automatic tests.
Split them into unit and integration tests. Integration tests really
need to be run on the real platform (not in a VM etc) since they are
somewhat unstable or nonfunctional otherwise.
A few tests were previously broken by QUrl changes and they were repaired.
Removed one test since it was not providing a lot of value.
There are still a number of tests that rely on Q_AUTOTEST_EXPORT symbols.
Change-Id: Ic402abf0af946baa5945075d975b3f584f9ef280
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index affd4e3d2..2c368ea22 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,12 +1,4 @@ -TEMPLATE = subdirs - -SUBDIRS += multimedia.pro -contains(QT_CONFIG,multimediawidgets): SUBDIRS += multimediawidgets.pro - -# These autotests consist of things such as static code checks -# which require that the autotest is run on the same machine -# doing the build - i.e. cross-compilation is not allowed. -win32|mac|linux-g++* { - # NOTE: Disabled until we have established which tests fall into this category - # !contains(QT_CONFIG,embedded):!maemo5:!maemo6:SUBDIRS+=host.pro -} +TEMPLATE=subdirs +SUBDIRS += \ + unit \ + integration |