Make sure CTestTest scripts honor the CMAKE_TEST_GENERATOR so that if the...

Make sure CTestTest scripts honor the CMAKE_TEST_GENERATOR so that if the generator to build cmake is different than the one used for tests (watcom) is used.

Tests/CTestTestCrash/test.cmake.in

@@ -8,7 +8,9 @@ SET(CTEST_BUILD_NAME                    "CTestTest-@BUILDNAME@-Crash")
 SET(CTEST_SOURCE_DIRECTORY              "@CMake_SOURCE_DIR@/Tests/CTestTestCrash")
 SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestCrash")
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
-SET(CTEST_CMAKE_GENERATOR               "@CMAKE_GENERATOR@")
+SET(CMAKE_TEST_MAKEPROGRAM              "@CMAKE_TEST_MAKEPROGRAM@")
+SET(MAKECOMMAND                         "@MAKECOMMAND@")
+SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
 SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
@@ -20,12 +22,9 @@ SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIP
 
 
 FILE(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
-CMAKE_CXX_FLAGS:STRING=@CMAKE_CXX_FLAGS@
-CMAKE_C_FLAGS:STRING=@CMAKE_C_FLAGS@
-CMAKE_C_COMPILER:STRING=@CMAKE_C_COMPILER@
-CMAKE_CXX_COMPILER:STRING=@CMAKE_CXX_COMPILER@
-CMAKE_C_COMPILER_ARG1:STRING=@CMAKE_C_COMPILER_ARG1@
-CMAKE_CXX_COMPILER_ARG1:STRING=@CMAKE_CXX_COMPILER_ARG1@
+CMAKE_TEST_GENERATOR:STRING=@CMAKE_TEST_GENERATOR@
+CMAKE_TEST_MAKEPROGRAM:FILEPATH=@CMAKE_TEST_MAKEPROGRAM@
+MAKECOMMAND:STRING=@MAKECOMMAND@
 ")
 
 CTEST_START(Experimental)

Tests/CTestTestFailure/testNoExe.cmake.in

@@ -8,7 +8,9 @@ SET(CTEST_BUILD_NAME                    "CTestTest-@BUILDNAME@-NoExe")
 SET(CTEST_SOURCE_DIRECTORY              "@CMake_SOURCE_DIR@/Tests/CTestTestFailure")
 SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestFailure")
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
-SET(CTEST_CMAKE_GENERATOR               "@CMAKE_GENERATOR@")
+SET(CMAKE_TEST_MAKEPROGRAM              "@CMAKE_TEST_MAKEPROGRAM@")
+SET(MAKECOMMAND                         "@MAKECOMMAND@")
+SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
 SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
@@ -20,12 +22,9 @@ SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIP
 
 
 FILE(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
-CMAKE_CXX_FLAGS:STRING=@CMAKE_CXX_FLAGS@
-CMAKE_C_FLAGS:STRING=@CMAKE_C_FLAGS@
-CMAKE_C_COMPILER:STRING=@CMAKE_C_COMPILER@
-CMAKE_CXX_COMPILER:STRING=@CMAKE_CXX_COMPILER@
-CMAKE_C_COMPILER_ARG1:STRING=@CMAKE_C_COMPILER_ARG1@
-CMAKE_CXX_COMPILER_ARG1:STRING=@CMAKE_CXX_COMPILER_ARG1@
+CMAKE_TEST_GENERATOR:STRING=@CMAKE_TEST_GENERATOR@
+CMAKE_TEST_MAKEPROGRAM:FILEPATH=@CMAKE_TEST_MAKEPROGRAM@
+MAKECOMMAND:STRING=@MAKECOMMAND@
 ")
 
 CTEST_START(Experimental)

Tests/CTestTestParallel/test.cmake.in

@@ -8,7 +8,9 @@ SET(CTEST_BUILD_NAME                    "CTestTest-@BUILDNAME@-Parallel")
 SET(CTEST_SOURCE_DIRECTORY              "@CMake_SOURCE_DIR@/Tests/CTestTestParallel")
 SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestParallel")
 SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
-SET(CTEST_CMAKE_GENERATOR               "@CMAKE_GENERATOR@")
+SET(CMAKE_TEST_MAKEPROGRAM              "@CMAKE_TEST_MAKEPROGRAM@")
+SET(MAKECOMMAND                         "@MAKECOMMAND@")
+SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
 SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
 SET(CTEST_MEMORYCHECK_COMMAND           "@MEMORYCHECK_COMMAND@")
 SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
@@ -19,12 +21,9 @@ SET(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIP
 #CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
 
 FILE(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
-CMAKE_CXX_FLAGS:STRING=@CMAKE_CXX_FLAGS@
-CMAKE_C_FLAGS:STRING=@CMAKE_C_FLAGS@
-CMAKE_C_COMPILER:STRING=@CMAKE_C_COMPILER@
-CMAKE_CXX_COMPILER:STRING=@CMAKE_CXX_COMPILER@
-CMAKE_C_COMPILER_ARG1:STRING=@CMAKE_C_COMPILER_ARG1@
-CMAKE_CXX_COMPILER_ARG1:STRING=@CMAKE_CXX_COMPILER_ARG1@
+CMAKE_TEST_GENERATOR:STRING=@CMAKE_TEST_GENERATOR@
+CMAKE_TEST_MAKEPROGRAM:FILEPATH=@CMAKE_TEST_MAKEPROGRAM@
+MAKECOMMAND:STRING=@MAKECOMMAND@
 ")
 
 CTEST_START(Experimental)