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>
This commit is contained in:
committed by
Qt by Nokia
parent
7dfb883df6
commit
e3a8c165ea
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user