Factorize the cmake test infrastructure to be reusable.

This makes it easy to add cmake module tests for all modules.

Change-Id: I303bf7674ca6ae7a8544488f96e8e02afbaa6ff0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

diff --git a/mkspecs/features/ctest_testcase.prf b/mkspecs/features/ctest_testcase.prf
new file mode 100644 (file)
index 0000000..46c175e
--- /dev/null
+++ b/mkspecs/features/ctest_testcase.prf
@@ -0,0 +1,51 @@
+
+CMAKE_VERSION = $$system(cmake --version)
+
+check.commands =
+isEmpty(CMAKE_VERSION) {
+    message("cmake executable not found. Not running CMake unit tests")
+} else {
+    CTEST_VERSION = $$system(ctest --version)
+    isEmpty(CTEST_VERSION) {
+        message("ctest executable not found. Not running CMake unit tests")
+    } else {
+        CMAKE_VERSION = $$last(CMAKE_VERSION)
+        CMAKE_VERSION_MAJOR = $$section(CMAKE_VERSION, ., 0, 0)
+        CMAKE_VERSION_MINOR = $$section(CMAKE_VERSION, ., 1, 1)
+        CMAKE_VERSION_PATCH = $$section(CMAKE_VERSION, ., 2, 2)
+
+        VERSION_OK =
+        greaterThan(CMAKE_VERSION_MAJOR, 2) {
+            VERSION_OK = 1
+        } else:greaterThan(CMAKE_VERSION_MAJOR, 1):greaterThan(CMAKE_VERSION_MINOR, 8) {
+            VERSION_OK = 1
+        } else:greaterThan(CMAKE_VERSION_MAJOR, 1):greaterThan(CMAKE_VERSION_MINOR, 7):greaterThan(CMAKE_VERSION_PATCH, 2) {
+            VERSION_OK = 1
+        }
+
+        isEmpty(VERSION_OK) {
+            message("cmake $$CMAKE_VERSION is too old for this test.")
+        } else {
+            SET = set
+            equals(QMAKE_DIR_SEP, "/"):SET = export
+
+            CMAKE_BUILD_TYPE = Debug
+            CONFIG(release, debug|release):CMAKE_BUILD_TYPE = Release
+
+            BUILD_DIR = $$replace($$list($$OUT_PWD/build), /, $$QMAKE_DIR_SEP)
+
+            check.commands = \
+                cd . && $$SET CMAKE_PREFIX_PATH=$$[QT_INSTALL_PREFIX] && \
+                $(MKDIR) $$BUILD_DIR && cd $$BUILD_DIR && \
+                cmake $$_PRO_FILE_PWD_ -DCMAKE_BUILD_TYPE=$${CMAKE_BUILD_TYPE} && \
+                $(TESTRUNNER) ctest --output-on-failure
+
+        }
+    }
+}
+
+insignificant_test:!isEmpty(check.commands) {
+    check.commands = -$${check.commands}
+}
+
+QMAKE_EXTRA_TARGETS *= check

diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro
index 0fe999b..bf2dbcb 100644 (file)
--- a/tests/auto/cmake/cmake.pro
+++ b/tests/auto/cmake/cmake.pro
@@ -1,54 +1,5 @@
 
-CMAKE_VERSION = $$system(cmake --version)
-
 # Cause make to do nothing.
 TEMPLATE = subdirs
 
-check.commands =
-isEmpty(CMAKE_VERSION) {
-    message("cmake executable not found. Not running CMake unit tests")
-} else {
-    CTEST_VERSION = $$system(ctest --version)
-    isEmpty(CTEST_VERSION) {
-        message("ctest executable not found. Not running CMake unit tests")
-    } else {
-        CMAKE_VERSION = $$last(CMAKE_VERSION)
-        CMAKE_VERSION_MAJOR = $$section(CMAKE_VERSION, ., 0, 0)
-        CMAKE_VERSION_MINOR = $$section(CMAKE_VERSION, ., 1, 1)
-        CMAKE_VERSION_PATCH = $$section(CMAKE_VERSION, ., 2, 2)
-
-        VERSION_OK =
-        greaterThan(CMAKE_VERSION_MAJOR, 2) {
-            VERSION_OK = 1
-        } else:greaterThan(CMAKE_VERSION_MAJOR, 1):greaterThan(CMAKE_VERSION_MINOR, 8) {
-            VERSION_OK = 1
-        } else:greaterThan(CMAKE_VERSION_MAJOR, 1):greaterThan(CMAKE_VERSION_MINOR, 7):greaterThan(CMAKE_VERSION_PATCH, 2) {
-            VERSION_OK = 1
-        }
-
-        isEmpty(VERSION_OK) {
-            message("cmake $$CMAKE_VERSION is too old for this test.")
-        } else {
-            SET = set
-            equals(QMAKE_DIR_SEP, "/"):SET = export
-
-            CMAKE_BUILD_TYPE = Debug
-            CONFIG(release, debug|release):CMAKE_BUILD_TYPE = Release
-
-            BUILD_DIR = $$replace($$list($$OUT_PWD/build), /, $$QMAKE_DIR_SEP)
-
-            check.commands = \
-                cd . && $$SET CMAKE_PREFIX_PATH=$$[QT_INSTALL_PREFIX] && \
-                $(MKDIR) $$BUILD_DIR && cd $$BUILD_DIR && \
-                cmake $$_PRO_FILE_PWD_ -DCMAKE_BUILD_TYPE=$${CMAKE_BUILD_TYPE} && \
-                $(TESTRUNNER) ctest --output-on-failure
-
-        }
-    }
-}
-
-insignificant_test:!isEmpty(check.commands) {
-    check.commands = -$${check.commands}
-}
-
-QMAKE_EXTRA_TARGETS *= check
+CONFIG += ctest_testcase