From 91720b5bc22410177512abcaea9716de5446162e Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Fri, 29 Jun 2012 08:32:01 +0200
Subject: Move the macros for invoking ctest to a shared location.

They are still internal, but all Qt5 modules will be able to use
them then.

Change-Id: I42ab656115b0976ca959293dfd664ec071f35dbf
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
---
 tests/auto/cmake/CMakeLists.txt | 44 ++---------------------------------------
 1 file changed, 2 insertions(+), 42 deletions(-)

(limited to 'tests/auto/cmake/CMakeLists.txt')

diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index 0f7297dd3d..6ee8ee2126 100644
--- a/tests/auto/cmake/CMakeLists.txt
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -43,49 +43,9 @@ project(qmake_cmake_files)
 
 enable_testing()
 
-macro(expect_pass _dir)
-  string(REPLACE "(" "_" testname "${_dir}")
-  string(REPLACE ")" "_" testname "${testname}")
-  add_test(${testname} ${CMAKE_CTEST_COMMAND}
-    --build-and-test
-    "${CMAKE_CURRENT_SOURCE_DIR}/${_dir}"
-    "${CMAKE_CURRENT_BINARY_DIR}/${_dir}"
-    --build-generator ${CMAKE_GENERATOR}
-    --build-makeprogram ${CMAKE_MAKE_PROGRAM}
-    --build-options -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-  )
-endmacro()
+find_package(Qt5Core REQUIRED)
 
-macro(expect_fail _dir)
-  string(REPLACE "(" "_" testname "${_dir}")
-  string(REPLACE ")" "_" testname "${testname}")
-  file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/failbuild/${_dir}")
-  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/${_dir}" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/failbuild/${_dir}")
-  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/failbuild/${_dir}/CMakeLists.txt"
-    "
-      cmake_minimum_required(VERSION 2.8)
-      project(${_dir}_build)
-
-      try_compile(Result \${CMAKE_CURRENT_BINARY_DIR}/${_dir}
-          \${CMAKE_CURRENT_SOURCE_DIR}/${_dir}
-          ${_dir}
-          OUTPUT_VARIABLE Out
-      )
-      message(\"\${Out}\")
-      if (Result)
-        message(SEND_ERROR \"Succeeded build which should fail\")
-      endif()
-      "
-  )
-  add_test(${testname} ${CMAKE_CTEST_COMMAND}
-    --build-and-test
-    "${CMAKE_CURRENT_BINARY_DIR}/failbuild/${_dir}"
-    "${CMAKE_CURRENT_BINARY_DIR}/failbuild/${_dir}/build"
-    --build-generator ${CMAKE_GENERATOR}
-    --build-makeprogram ${CMAKE_MAKE_PROGRAM}
-    --build-options -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-  )
-endmacro()
+include("${_Qt5CTestMacros}")
 
 if(NOT ${CMAKE_VERSION} VERSION_LESS 2.8.8)
     # Requires INCLUDE_DIRECTORIES target property in CMake 2.8.8
-- 
cgit v1.2.3