diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-07 14:29:22 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-02-07 14:31:42 (GMT) |
| commit | a88acb0a419d184102c65ee9456950f2cea1cc71 (patch) | |
| tree | dbed8607d4dc9ad5744f9f2791b655885526dfac /Tests | |
| parent | 5e984bb35232116a54de7db39788cb162ca7c263 (diff) | |
| download | CMake-a88acb0a419d184102c65ee9456950f2cea1cc71.zip CMake-a88acb0a419d184102c65ee9456950f2cea1cc71.tar.gz CMake-a88acb0a419d184102c65ee9456950f2cea1cc71.tar.bz2 | |
Tests/RunCMake/Ninja: Rename showIncludes case for clang-cl <= 17
Make room for a new case for clang-cl 18.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/Ninja/RunCMakeTest.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17-check.cmake (renamed from Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-check.cmake) | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17-stdout.txt (renamed from Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-stdout.txt) | 0 | ||||
| -rw-r--r-- | Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17.cmake (renamed from Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl.cmake) | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/showIncludes.c | 4 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Tests/RunCMake/Ninja/RunCMakeTest.cmake b/Tests/RunCMake/Ninja/RunCMakeTest.cmake index 13d9620..7f877fb 100644 --- a/Tests/RunCMake/Ninja/RunCMakeTest.cmake +++ b/Tests/RunCMake/Ninja/RunCMakeTest.cmake @@ -46,7 +46,7 @@ if(WIN32) if(RunCMake_MAKE_PROGRAM) set(maybe_MAKE_PROGRAM "-DRunCMake_MAKE_PROGRAM=${RunCMake_MAKE_PROGRAM}") endif() - run_cmake_script(ShowIncludes-437-ClangCl -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM}) + run_cmake_script(ShowIncludes-437-ClangCl-17 -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM}) run_cmake_script(ShowIncludes-437-English -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM}) run_cmake_script(ShowIncludes-437-French -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM}) run_cmake_script(ShowIncludes-437-German -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM}) diff --git a/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-check.cmake b/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17-check.cmake index 6136463..3ebdb4f 100644 --- a/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-check.cmake +++ b/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17-check.cmake @@ -1,3 +1,3 @@ -# 'clang-cl /showIncludes' prefix. +# 'clang-cl /showIncludes' prefix for clang-cl <= 17. set(expect "Note: including file: ") include(${CMAKE_CURRENT_LIST_DIR}/ShowIncludes-check.cmake) diff --git a/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-stdout.txt b/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17-stdout.txt index bda7eab..bda7eab 100644 --- a/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-stdout.txt +++ b/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17-stdout.txt diff --git a/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl.cmake b/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17.cmake index 7eca3d3..9642f06 100644 --- a/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl.cmake +++ b/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17.cmake @@ -1,3 +1,3 @@ set(CODEPAGE 437) -set(VSLANG "clang-cl") # Special case for test, not a real VS value. +set(VSLANG "clang-cl-17") # Special case for test, not a real VS value. include(${CMAKE_CURRENT_LIST_DIR}/ShowIncludes.cmake) diff --git a/Tests/RunCMake/showIncludes.c b/Tests/RunCMake/showIncludes.c index 7d467cf..06490ca 100644 --- a/Tests/RunCMake/showIncludes.c +++ b/Tests/RunCMake/showIncludes.c @@ -28,8 +28,8 @@ int main() printf("OEM code page: %u\n", GetOEMCP()); printf("VSLANG: %s\n", vslang); - // clang-cl (special case for test, not a real VS value). - if (strcmp(vslang, "clang-cl") == 0) { + // clang-cl <= 17 (special case for test, not a real VS value). + if (strcmp(vslang, "clang-cl-17") == 0) { if (cp == 437 || cp == 65001) { printf("Note: including file: ./foo.h\n"); return 0; |