AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some return() to remove indentation levels.

Browse Source 
Change-Id: I48dc013fece0f4758ad54342f97ed51b33a9c2ff
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Stephen Kelly 2013-07-02 23:07:24 +02:00 committed by The Qt Project
parent 9514422eee
commit 494c81e78a
1 changed files with 80 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mkspecs/features/ctest_testcase_common.prf
View File

@ -7,13 +7,26 @@ win32 {
check.commands = check.commands =
QMAKE_EXTRA_TARGETS *= check
insignificant_test: return()
isEmpty(CMAKE_VERSION) { isEmpty(CMAKE_VERSION) {
message("cmake executable not found. Not running CMake unit tests") message("cmake executable not found. Not running CMake unit tests")
return()
}
win32 {
CTEST_VERSION = $$system(ctest --version 2>NUL)
} else { } else {
CTEST_VERSION = $$system(ctest --version) CTEST_VERSION = $$system(ctest --version 2>/dev/null)
}
isEmpty(CTEST_VERSION) { isEmpty(CTEST_VERSION) {
message("ctest executable not found. Not running CMake unit tests") message("ctest executable not found. Not running CMake unit tests")
} else { return()
}
CMAKE_VERSION = $$last(CMAKE_VERSION) CMAKE_VERSION = $$last(CMAKE_VERSION)
CMAKE_VERSION_MAJOR = $$section(CMAKE_VERSION, ., 0, 0) CMAKE_VERSION_MAJOR = $$section(CMAKE_VERSION, ., 0, 0)
CMAKE_VERSION_MINOR = $$section(CMAKE_VERSION, ., 1, 1) CMAKE_VERSION_MINOR = $$section(CMAKE_VERSION, ., 1, 1)
@ -32,7 +45,9 @@ isEmpty(CMAKE_VERSION) {
isEmpty(VERSION_OK) { isEmpty(VERSION_OK) {
message("cmake $$CMAKE_VERSION is too old for this test.") message("cmake $$CMAKE_VERSION is too old for this test.")
} else { return()
}
load(cmake_functions) load(cmake_functions)
CMAKE_BUILD_TYPE = Debug CMAKE_BUILD_TYPE = Debug
@ -79,13 +94,3 @@ isEmpty(CMAKE_VERSION) {
$${CMAKE_MODULE_VERSIONS} \ $${CMAKE_MODULE_VERSIONS} \
-DCMAKE_MODULES_UNDER_TEST=\"$$CMAKE_MODULES_UNDER_TEST\" && \ -DCMAKE_MODULES_UNDER_TEST=\"$$CMAKE_MODULES_UNDER_TEST\" && \
$(TESTRUNNER) ctest --output-on-failure $(TESTRUNNER) ctest --output-on-failure
}
}
}
insignificant_test:!isEmpty(check.commands) {
check.commands = -$${check.commands}
}
QMAKE_EXTRA_TARGETS *= check