From e3a8c165eabe139d71a762089ab396e5b492c70b Mon Sep 17 00:00:00 2001 From: Michael Goddard Date: Fri, 4 Nov 2011 13:38:44 +1000 Subject: 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 --- tests/auto/auto.pro | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'tests/auto/auto.pro') 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 -- cgit v1.2.3