CheckTypeSize: Move tests

Tests/CMakeLists.txt

@@ -673,8 +673,6 @@ if(BUILD_TESTING)
     "${CMake_BINARY_DIR}/Tests/CMakeBuildDoubleProjectTest.cmake")
   list(APPEND TEST_BUILD_DIRS ${CMAKE_BUILD_TEST_BINARY_DIR})
 
-  ADD_TEST_MACRO(Module.CheckTypeSize CheckTypeSize)
-
   set(Module.CheckIPOSupported-C_BUILD_OPTIONS -DCMake_TEST_IPO_WORKS_C=${CMake_TEST_IPO_WORKS_C})
   ADD_TEST_MACRO(Module.CheckIPOSupported-C CheckIPOSupported-C)
 

Tests/RunCMake/CheckModules/CheckTypeSize.cmake

@@ -0,0 +1,2 @@
+enable_testing()
+add_subdirectory(CheckTypeSize)

Tests/RunCMake/CheckModules/CheckTypeSize/CMakeLists.txt

@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.10)
 project(CheckTypeSize)
 
 # Check C types
@@ -37,3 +36,5 @@ include_directories("${CheckTypeSize_BINARY_DIR}")
 
 add_executable(CheckTypeSize CheckTypeSize.c)
 add_executable(CheckTypeSizeCXX CheckTypeSize.cxx)
+
+add_test(NAME CheckTypeSize COMMAND CheckTypeSize)

Tests/RunCMake/CheckModules/CheckTypeSize/CheckTypeSize.c

@@ -143,7 +143,7 @@ int main(void)
   NODEF(SIZEOF_STRUCTMEMBER_PTR);
 #endif
 
-/* struct somestruct::someint */
+/* struct somestruct::somechar */
 #if defined(SIZEOF_STRUCTMEMBER_CHAR)
   CHECK(x.somechar, SIZEOF_STRUCTMEMBER_CHAR);
   CHECK(x.somechar, SIZEOF_CHAR);

Tests/RunCMake/CheckModules/RunCMakeTest.cmake

@@ -17,6 +17,17 @@ run_cmake(CheckTypeSizeMixedArgs)
 
 run_cmake(CheckTypeSizeOkNoC)
 
+block()
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/CheckTypeSize-build)
+  run_cmake(CheckTypeSize)
+
+  set(RunCMake_TEST_NO_CLEAN 1)
+  set(RunCMake_TEST_OUTPUT_MERGE 1)
+
+  run_cmake_command(CheckTypeSize-build ${CMAKE_COMMAND} --build .)
+  run_cmake_command(CheckTypeSize-build ${CMAKE_CTEST_COMMAND} -C Debug)
+endblock()
+
 run_cmake(CheckIncludeFilesOk)
 run_cmake(CheckIncludeFilesOkNoC)
 run_cmake(CheckIncludeFilesMissingLanguage)