From b5c23e1c5afaa99f34dbd3b1802c7962c584cd84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Pereira?= Date: Fri, 13 Sep 2013 06:56:09 -0700 Subject: Don't install test stuff MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Testing is done by the developer/builder. No need to install it. test.xml testdefinition also removed. It was not being used it anyway. Change-Id: I24c56df85ce00368934a731fde6a3cf253dedb41 Signed-off-by: Luís Pereira Reviewed-by: David Faure --- tests/auto/auto.pro | 11 -------- .../qmimedatabase-cache/qmimedatabase-cache.pro | 29 ++++------------------ .../qmimedatabase-xml/qmimedatabase-xml.pro | 29 ++++------------------ tests/auto/qmimedatabase/qmimedatabase.pro | 11 -------- tests/auto/qmimetype/qmimetype.pro | 24 +----------------- tests/auto/tests.xml | 27 -------------------- 6 files changed, 11 insertions(+), 120 deletions(-) delete mode 100644 tests/auto/tests.xml diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index e90552c..04b136f 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -3,14 +3,3 @@ TEMPLATE = subdirs SUBDIRS += \ qmimetype \ qmimedatabase \ - -testrunner_config.files += tests.xml - -unix:!symbian { - maemo5 { - testrunner_config.path = /opt/usr/share/QtMimeTypes-tests - } else { - testrunner_config.path = /usr/share/QtMimeTypes-tests - } - INSTALLS += testrunner_config -} diff --git a/tests/auto/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro b/tests/auto/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro index 1ab1370..5fb02d3 100644 --- a/tests/auto/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro +++ b/tests/auto/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro @@ -17,31 +17,12 @@ CONFIG += depend_includepath SOURCES = tst_qmimedatabase-cache.cpp HEADERS = ../tst_qmimedatabase.h -contains(QMAKE_CXX, --sysroot): { - unix:!symbian { - maemo5 { - DEFINES += SRCDIR='"\\"/opt/usr/lib/QtMimeTypes-tests/\\""' - } else { - DEFINES += SRCDIR='"\\"/usr/lib/QtMimeTypes-tests/\\""' - } - } -} else { - DEFINES += SRCDIR='"\\"$$PWD/../\\""' - - QMAKE_EXTRA_TARGETS += check - check.depends = $$TARGET - check.commands = LD_LIBRARY_PATH=$$(LD_LIBRARY_PATH):$$OUT_PWD/../../../../src/mimetypes ./$$TARGET # -xunitxml -o $${TARGET}.xml -} +DEFINES += SRCDIR='"\\"$$PWD/../\\""' + +QMAKE_EXTRA_TARGETS += check +check.depends = $$TARGET +check.commands = LD_LIBRARY_PATH=$$(LD_LIBRARY_PATH):$$OUT_PWD/../../../../src/mimetypes ./$$TARGET DEFINES += CORE_SOURCES='"\\"$$PWD/../../../../src\\""' *-g++*:QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -Wno-long-long -Wnon-virtual-dtor - -unix:!symbian { - maemo5 { - target.path = /opt/usr/lib/QtMimeTypes-tests/qmimedatabase-cache - } else { - target.path = /usr/lib/QtMimeTypes-tests/qmimedatabase-cache - } - INSTALLS += target -} diff --git a/tests/auto/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro b/tests/auto/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro index d8b4492..2ffde9c 100644 --- a/tests/auto/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro +++ b/tests/auto/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro @@ -17,31 +17,12 @@ CONFIG += depend_includepath SOURCES += tst_qmimedatabase-xml.cpp HEADERS += ../tst_qmimedatabase.h -contains(QMAKE_CXX, --sysroot): { - unix:!symbian { - maemo5 { - DEFINES += SRCDIR='"\\"/opt/usr/lib/QtMimeTypes-tests/\\""' - } else { - DEFINES += SRCDIR='"\\"/usr/lib/QtMimeTypes-tests/\\""' - } - } -} else { - DEFINES += SRCDIR='"\\"$$PWD/../\\""' - - QMAKE_EXTRA_TARGETS += check - check.depends = $$TARGET - check.commands = LD_LIBRARY_PATH=$$(LD_LIBRARY_PATH):$$OUT_PWD/../../../../src/mimetypes ./$$TARGET # -xunitxml -o $${TARGET}.xml -} +DEFINES += SRCDIR='"\\"$$PWD/../\\""' + +QMAKE_EXTRA_TARGETS += check +check.depends = $$TARGET +check.commands = LD_LIBRARY_PATH=$$(LD_LIBRARY_PATH):$$OUT_PWD/../../../../src/mimetypes ./$$TARGET DEFINES += CORE_SOURCES='"\\"$$PWD/../../../../src\\""' *-g++*:QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -Wno-long-long -Wnon-virtual-dtor - -unix:!symbian { - maemo5 { - target.path = /opt/usr/lib/QtMimeTypes-tests/qmimedatabase-xml - } else { - target.path = /usr/lib/QtMimeTypes-tests/qmimedatabase-xml - } - INSTALLS += target -} diff --git a/tests/auto/qmimedatabase/qmimedatabase.pro b/tests/auto/qmimedatabase/qmimedatabase.pro index e807f0b..7a76149 100644 --- a/tests/auto/qmimedatabase/qmimedatabase.pro +++ b/tests/auto/qmimedatabase/qmimedatabase.pro @@ -3,14 +3,3 @@ SUBDIRS = qmimedatabase-xml unix: SUBDIRS += qmimedatabase-cache OTHER_FILES = testfiles/list - -the_testfiles.files += testfiles/* - -unix:!symbian { - maemo5 { - the_testfiles.path = /opt/usr/lib/QtMimeTypes-tests/testfiles - } else { - the_testfiles.path = /usr/lib/QtMimeTypes-tests/testfiles - } - INSTALLS += the_testfiles -} diff --git a/tests/auto/qmimetype/qmimetype.pro b/tests/auto/qmimetype/qmimetype.pro index 3f076d3..4039e4d 100644 --- a/tests/auto/qmimetype/qmimetype.pro +++ b/tests/auto/qmimetype/qmimetype.pro @@ -21,26 +21,4 @@ HEADERS += tst_qmimetype.h QMAKE_EXTRA_TARGETS += check check.depends = $$TARGET -check.commands = LD_LIBRARY_PATH=$$(LD_LIBRARY_PATH):$$OUT_PWD/../../../src/mimetypes ./$$TARGET # -xunitxml -o $${TARGET}.xml - -exists($${TARGET}.xml): { - tests_results.files += $${TARGET}.xml - - unix:!symbian { - maemo5 { - tests_results.path = /opt/usr/share/QtMimeTypes-unittests - } else { - tests_results.path = /usr/share/QtMimeTypes-unittests - } - INSTALLS += tests_results - } -} - -unix:!symbian { - maemo5 { - target.path = /opt/usr/lib/QtMimeTypes-tests/qmimetype - } else { - target.path = /usr/lib/QtMimeTypes-tests/qmimetype - } - INSTALLS += target -} +check.commands = LD_LIBRARY_PATH=$$(LD_LIBRARY_PATH):$$OUT_PWD/../../../src/mimetypes ./$$TARGET diff --git a/tests/auto/tests.xml b/tests/auto/tests.xml deleted file mode 100644 index 11b7569..0000000 --- a/tests/auto/tests.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - Test for QMimeType - cd /usr/lib/QtMimeTypes-tests/qmimetype; ./tst_qmimetype - - - Test for QMimeDatabase (Cache) - cd /usr/lib/QtMimeTypes-tests/qmimedatabase-cache; ./tst_qmimedatabase-cache - - - Test for QMimeDatabase (XML) - cd /usr/lib/QtMimeTypes-tests/qmimedatabase-xml; ./tst_qmimedatabase-xml - - - Test for QML wrapper of QMimeType - cd /usr/lib/QtMimeTypes-tests/qdeclarativemimetype; ./tst_qdeclarativemimetype -platform Minimal - - - Test for QML wrapper of QMimeDatabase - cd /usr/lib/QtMimeTypes-tests/qdeclarativemimedatabase; ./tst_qdeclarativemimedatabase -platform Minimal - - - - -- cgit v1.2.3