From 4272fc8a65e6d5ad6bfe1ea45039a2ac300defb6 Mon Sep 17 00:00:00 2001 From: kh1 Date: Tue, 24 Jun 2014 11:58:59 +0200 Subject: Revert "Make the auto tests available by default." This reverts commit fca72823ea2a9c627e86d2fb769929999ed6fe43 to speed up compilation on slower systems. It introduces the possibility to set an environment variable or pass BUILDTESTS as argument to qmake to make the tests available. Change-Id: Iab5846473bac2dddbec85b45a7a7ad70552171a4 Reviewed-by: Kai Koehne --- installerfw.pro | 6 +++++- tests/tests.pro | 21 ++------------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/installerfw.pro b/installerfw.pro index 9eed1347f..f816aa82f 100644 --- a/installerfw.pro +++ b/installerfw.pro @@ -1,10 +1,14 @@ CONFIG += ordered TEMPLATE = subdirs -SUBDIRS += src tests tools +SUBDIRS += src tools include (installerfw.pri) include (doc/doc.pri) +BUILD_TESTS = $$(BUILDTESTS) +isEmpty(BUILD_TESTS):BUILD_TESTS=$${BUILDTESTS} +!isEmpty(BUILD_TESTS):SUBDIRS += tests + !minQtVersion(5, 3, 0) { message("Cannot build Qt Installer Framework with Qt version $${QT_VERSION}.") error("Use at least Qt 5.3.0.") diff --git a/tests/tests.pro b/tests/tests.pro index fc08c708b..1e8963ed2 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,24 +1,7 @@ CONFIG += ordered TEMPLATE = subdirs -SUBDIRS += auto -EXTRASUBDIRS = \ +SUBDIRS = \ + auto \ downloadspeed \ environmentvariable - -include(../installerfw.pri) - -!isEqual(IFW_SOURCE_TREE, $$IFW_BUILD_TREE) { - for(SUBDIR, EXTRASUBDIRS) { - mkdir.commands += $$QMAKE_MKDIR $$SUBDIR $${IFW_NEWLINE} - } - QMAKE_EXTRA_TARGETS += mkdir -} - -for(SUBDIR, EXTRASUBDIRS) { - tests.commands += cd $$SUBDIR && $(QMAKE) -r $$PWD/$$SUBDIR && $(MAKE) $${IFW_NEWLINE} -} -!isEqual(IFW_SOURCE_TREE, $$IFW_BUILD_TREE) { - tests.depends = mkdir -} -QMAKE_EXTRA_TARGETS *= tests -- cgit v1.2.3