diff options
| author | Brad King <brad.king@kitware.com> | 2023-01-26 20:16:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-01-28 12:16:58 (GMT) |
| commit | 8f82e755f336c66194ce8229575e4651cb7a4c62 (patch) | |
| tree | 9f135856ceb1b660c8525efb3a178b20a3f12c4e /Tests/RunCMake | |
| parent | d6e7e4d4a1844af15c005dab2db6237464ad160d (diff) | |
| download | CMake-8f82e755f336c66194ce8229575e4651cb7a4c62.zip CMake-8f82e755f336c66194ce8229575e4651cb7a4c62.tar.gz CMake-8f82e755f336c66194ce8229575e4651cb7a4c62.tar.bz2 | |
Ninja: Fix detection of MSVC showIncludes prefix in Italian
The prefix does not have two colons. Update our regex.
Fixes: #24357
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/Ninja/RunCMakeTest.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/Ninja/ShowIncludes-437-Italian-check.cmake | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/Ninja/ShowIncludes-437-Italian-stdout.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/Ninja/ShowIncludes-437-Italian.cmake | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/showIncludes.c | 7 |
5 files changed, 15 insertions, 0 deletions
diff --git a/Tests/RunCMake/Ninja/RunCMakeTest.cmake b/Tests/RunCMake/Ninja/RunCMakeTest.cmake index d63c0c4..9214e90 100644 --- a/Tests/RunCMake/Ninja/RunCMakeTest.cmake +++ b/Tests/RunCMake/Ninja/RunCMakeTest.cmake @@ -49,6 +49,7 @@ if(WIN32) 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}) + run_cmake_script(ShowIncludes-437-Italian -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM}) run_cmake_script(ShowIncludes-54936-Chinese -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM}) run_cmake_script(ShowIncludes-65001-Chinese -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM}) run_cmake_script(ShowIncludes-65001-French -DshowIncludes=${showIncludes} ${maybe_MAKE_PROGRAM}) diff --git a/Tests/RunCMake/Ninja/ShowIncludes-437-Italian-check.cmake b/Tests/RunCMake/Ninja/ShowIncludes-437-Italian-check.cmake new file mode 100644 index 0000000..014ce7f --- /dev/null +++ b/Tests/RunCMake/Ninja/ShowIncludes-437-Italian-check.cmake @@ -0,0 +1,3 @@ +# 'cl /showIncludes' prefix with 'VSLANG=1040' and 'chcp 437'. +set(expect "Nota: file incluso ") +include(${CMAKE_CURRENT_LIST_DIR}/ShowIncludes-check.cmake) diff --git a/Tests/RunCMake/Ninja/ShowIncludes-437-Italian-stdout.txt b/Tests/RunCMake/Ninja/ShowIncludes-437-Italian-stdout.txt new file mode 100644 index 0000000..9dd03a5 --- /dev/null +++ b/Tests/RunCMake/Ninja/ShowIncludes-437-Italian-stdout.txt @@ -0,0 +1 @@ +-- showIncludes='Nota: file incluso ' diff --git a/Tests/RunCMake/Ninja/ShowIncludes-437-Italian.cmake b/Tests/RunCMake/Ninja/ShowIncludes-437-Italian.cmake new file mode 100644 index 0000000..be04271 --- /dev/null +++ b/Tests/RunCMake/Ninja/ShowIncludes-437-Italian.cmake @@ -0,0 +1,3 @@ +set(CODEPAGE 437) +set(VSLANG 1040) +include(${CMAKE_CURRENT_LIST_DIR}/ShowIncludes.cmake) diff --git a/Tests/RunCMake/showIncludes.c b/Tests/RunCMake/showIncludes.c index 27ce458..4ea2bcc 100644 --- a/Tests/RunCMake/showIncludes.c +++ b/Tests/RunCMake/showIncludes.c @@ -53,6 +53,13 @@ int main() } } + if (strcmp(vslang, "1040") == 0) { + if (cp == 437 || cp == 65001) { + printf("Nota: file incluso C:\\foo.h\n"); + return 0; + } + } + if (strcmp(vslang, "1041") == 0) { if (cp == 932) { printf("\x83\x81\x83\x82: " |