From 70ff1f15fc82205d8db18283f000fcad374173cb Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 7 Nov 2024 09:18:44 -0500 Subject: [PATCH] Tests/CTestTest*: Detect compiler from environment Three of these tests were still using the compiler selected for building CMake itself. In general our test suite is supposed to let each test select the compiler from the environment. This is particularly important on macOS where CMake might be built with compilers inside Xcode, which require an explicit `CMAKE_OSX_SYSROOT`. --- Tests/CTestTest/test.cmake.in | 6 ------ Tests/CTestTest2/test.cmake.in | 6 ------ Tests/CTestTestLaunchers/test.cmake.in | 9 --------- 3 files changed, 21 deletions(-) diff --git a/Tests/CTestTest/test.cmake.in b/Tests/CTestTest/test.cmake.in index 23166a7e3f..61d30a6a4b 100644 --- a/Tests/CTestTest/test.cmake.in +++ b/Tests/CTestTest/test.cmake.in @@ -43,12 +43,6 @@ BUILDNAME:STRING=SmallAndFast-@BUILDNAME@ CMAKE_GENERATOR:INTERNAL=@CMAKE_GENERATOR@ CMAKE_GENERATOR_PLATFORM:INTERNAL=@CMAKE_GENERATOR_PLATFORM@ CMAKE_GENERATOR_TOOLSET:INTERNAL=@CMAKE_GENERATOR_TOOLSET@ -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@ DART_ROOT:PATH= MEMORYCHECK_COMMAND:STRING=@MEMORYCHECK_COMMAND@ MEMORYCHECK_SUPPRESSIONS_FILE:FILEPATH=@MEMORYCHECK_SUPPRESSIONS_FILE@ diff --git a/Tests/CTestTest2/test.cmake.in b/Tests/CTestTest2/test.cmake.in index 6d833fe5af..48fd82ada5 100644 --- a/Tests/CTestTest2/test.cmake.in +++ b/Tests/CTestTest2/test.cmake.in @@ -28,12 +28,6 @@ endif() #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@ KWSYS_ENCODING_DEFAULT_CODEPAGE:STRING=CP_UTF8 # This one is needed for testing advanced ctest features diff --git a/Tests/CTestTestLaunchers/test.cmake.in b/Tests/CTestTestLaunchers/test.cmake.in index 21a3ed4365..3c99857128 100644 --- a/Tests/CTestTestLaunchers/test.cmake.in +++ b/Tests/CTestTestLaunchers/test.cmake.in @@ -22,15 +22,6 @@ function(run_test_case NAME WHAT) 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@ - ") - ctest_start(Experimental) ctest_configure(OPTIONS "-DCTEST_USE_LAUNCHERS=1") ctest_build(NUMBER_ERRORS error_count)