diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-24 14:18:08 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-29 16:52:19 +0100 |
commit | bcb0f28a4d8625e546ae6d43e1365cc1f8b5373c (patch) | |
tree | cf24cc3a9315f986688ca1a2fa127259097421e6 /tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml | |
parent | 39e616c15980153d76fda516ba42824599a45e42 (diff) |
Fix tests of QMimeDatabase.
- Use temporary directories to avoid instabilities
due to remains of previous failed tests and locked
directories.
- Replace SRCDIR by QFINDTESTDATA(), reference only
the freedesktop.org.xml contained in the Qt source
tree by $$QT.corelib.sources.
- Improve some error messages, test suite instructions
for Windows.
Change-Id: Idee8e3767ef0a8299df3bdaaac20334164878db0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: David Faure <faure@kde.org>
Diffstat (limited to 'tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml')
-rw-r--r-- | tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro | 2 | ||||
-rw-r--r-- | tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/tst_qmimedatabase-xml.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro index ac7515f781..4c00e84fc1 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro @@ -9,6 +9,6 @@ CONFIG += depend_includepath SOURCES += tst_qmimedatabase-xml.cpp HEADERS += ../tst_qmimedatabase.h -DEFINES += SRCDIR='"\\"$$PWD/../\\""' +DEFINES += CORE_SOURCES='"\\"$$QT.core.sources\\""' *-g++*:QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -Wshadow -Wno-long-long -Wnon-virtual-dtor diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/tst_qmimedatabase-xml.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/tst_qmimedatabase-xml.cpp index 13ca372290..30c7677198 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/tst_qmimedatabase-xml.cpp +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/tst_qmimedatabase-xml.cpp @@ -40,10 +40,8 @@ ****************************************************************************/ #include "../tst_qmimedatabase.h" -#include <QDebug> -#include <QDir> -tst_QMimeDatabase::tst_QMimeDatabase() +void tst_QMimeDatabase::init() { qputenv("QT_NO_MIME_CACHE", "1"); } |