From a88acb0a419d184102c65ee9456950f2cea1cc71 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 7 Feb 2024 09:29:22 -0500
Subject: Tests/RunCMake/Ninja: Rename showIncludes case for clang-cl <= 17

Make room for a new case for clang-cl 18.
---
 Tests/RunCMake/Ninja/RunCMakeTest.cmake                      | 2 +-
 Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17-check.cmake | 3 +++
 Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17-stdout.txt  | 1 +
 Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17.cmake       | 3 +++
 Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-check.cmake    | 3 ---
 Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-stdout.txt     | 1 -
 Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl.cmake          | 3 ---
 Tests/RunCMake/showIncludes.c                                | 4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17-check.cmake
 create mode 100644 Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17-stdout.txt
 create mode 100644 Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17.cmake
 delete mode 100644 Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-check.cmake
 delete mode 100644 Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-stdout.txt
 delete mode 100644 Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl.cmake

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-17-check.cmake b/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17-check.cmake
new file mode 100644
index 0000000..3ebdb4f
--- /dev/null
+++ b/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17-check.cmake
@@ -0,0 +1,3 @@
+# '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-17-stdout.txt b/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17-stdout.txt
new file mode 100644
index 0000000..bda7eab
--- /dev/null
+++ b/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17-stdout.txt
@@ -0,0 +1 @@
+-- showIncludes='Note: including file: '
diff --git a/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17.cmake b/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17.cmake
new file mode 100644
index 0000000..9642f06
--- /dev/null
+++ b/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-17.cmake
@@ -0,0 +1,3 @@
+set(CODEPAGE 437)
+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/Ninja/ShowIncludes-437-ClangCl-check.cmake b/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-check.cmake
deleted file mode 100644
index 6136463..0000000
--- a/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-check.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-# 'clang-cl /showIncludes' prefix.
-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-stdout.txt
deleted file mode 100644
index bda7eab..0000000
--- a/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl-stdout.txt
+++ /dev/null
@@ -1 +0,0 @@
--- showIncludes='Note: including file: '
diff --git a/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl.cmake b/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl.cmake
deleted file mode 100644
index 7eca3d3..0000000
--- a/Tests/RunCMake/Ninja/ShowIncludes-437-ClangCl.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(CODEPAGE 437)
-set(VSLANG "clang-cl") # 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;
-- 
cgit v0.12