From 56ae758bc531048fc662a339996058e1c3bd023e Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 12 Sep 2024 13:19:50 -0400
Subject: Tests/RunCMake/execute_process: Improve test for ENCODING UTF-8

Generalize the test infrastructure.  Add Chinese text to the sample.
---
 Tests/RunCMake/execute_process/Encoding.cmake           | 4 ++--
 Tests/RunCMake/execute_process/EncodingUTF-8-stderr.txt | 3 ++-
 Tests/RunCMake/execute_process/EncodingUTF-8.cmake      | 2 ++
 Tests/RunCMake/execute_process/EncodingUTF8-stderr.txt  | 3 ++-
 Tests/RunCMake/execute_process/EncodingUTF8.cmake       | 2 ++
 Tests/RunCMake/execute_process/RunCMakeTest.cmake       | 4 ++--
 6 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 Tests/RunCMake/execute_process/EncodingUTF-8.cmake
 create mode 100644 Tests/RunCMake/execute_process/EncodingUTF8.cmake

diff --git a/Tests/RunCMake/execute_process/Encoding.cmake b/Tests/RunCMake/execute_process/Encoding.cmake
index 3dc7c39..f43bcc7 100644
--- a/Tests/RunCMake/execute_process/Encoding.cmake
+++ b/Tests/RunCMake/execute_process/Encoding.cmake
@@ -1,6 +1,6 @@
 execute_process(
-  COMMAND ${TEST_ENCODING_EXE} ${TEST_ENCODING} ${CMAKE_CURRENT_LIST_DIR}/EncodingUTF8-stderr.txt
+  COMMAND ${TEST_ENCODING_EXE} ${ENCODING} ${CMAKE_CURRENT_LIST_DIR}/Encoding${ENCODING}-stderr.txt
   OUTPUT_VARIABLE out
-  ENCODING ${TEST_ENCODING}
+  ENCODING ${ENCODING}
   )
 message("${out}")
diff --git a/Tests/RunCMake/execute_process/EncodingUTF-8-stderr.txt b/Tests/RunCMake/execute_process/EncodingUTF-8-stderr.txt
index 0ac68de..9fd0dcd 100644
--- a/Tests/RunCMake/execute_process/EncodingUTF-8-stderr.txt
+++ b/Tests/RunCMake/execute_process/EncodingUTF-8-stderr.txt
@@ -1 +1,2 @@
-यूनिकोड είναι very здорово!
+Chinese Hindi  Greek English Russian
+注意    यूनिकोड είναι very    здорово!
diff --git a/Tests/RunCMake/execute_process/EncodingUTF-8.cmake b/Tests/RunCMake/execute_process/EncodingUTF-8.cmake
new file mode 100644
index 0000000..e9fc06e
--- /dev/null
+++ b/Tests/RunCMake/execute_process/EncodingUTF-8.cmake
@@ -0,0 +1,2 @@
+set(ENCODING UTF-8)
+include(${CMAKE_CURRENT_LIST_DIR}/Encoding.cmake)
diff --git a/Tests/RunCMake/execute_process/EncodingUTF8-stderr.txt b/Tests/RunCMake/execute_process/EncodingUTF8-stderr.txt
index 0ac68de..9fd0dcd 100644
--- a/Tests/RunCMake/execute_process/EncodingUTF8-stderr.txt
+++ b/Tests/RunCMake/execute_process/EncodingUTF8-stderr.txt
@@ -1 +1,2 @@
-यूनिकोड είναι very здорово!
+Chinese Hindi  Greek English Russian
+注意    यूनिकोड είναι very    здорово!
diff --git a/Tests/RunCMake/execute_process/EncodingUTF8.cmake b/Tests/RunCMake/execute_process/EncodingUTF8.cmake
new file mode 100644
index 0000000..78441ed
--- /dev/null
+++ b/Tests/RunCMake/execute_process/EncodingUTF8.cmake
@@ -0,0 +1,2 @@
+set(ENCODING UTF8)
+include(${CMAKE_CURRENT_LIST_DIR}/Encoding.cmake)
diff --git a/Tests/RunCMake/execute_process/RunCMakeTest.cmake b/Tests/RunCMake/execute_process/RunCMakeTest.cmake
index 7ee75af..8a56bb4 100644
--- a/Tests/RunCMake/execute_process/RunCMakeTest.cmake
+++ b/Tests/RunCMake/execute_process/RunCMakeTest.cmake
@@ -9,8 +9,8 @@ run_cmake_command(MergeOutputVars ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/Mer
 
 run_cmake(EncodingMissing)
 if(TEST_ENCODING_EXE)
-  run_cmake_command(EncodingUTF8 ${CMAKE_COMMAND} -DTEST_ENCODING=UTF8 -DTEST_ENCODING_EXE=${TEST_ENCODING_EXE} -P ${RunCMake_SOURCE_DIR}/Encoding.cmake)
-  run_cmake_command(EncodingUTF-8 ${CMAKE_COMMAND} -DTEST_ENCODING=UTF-8 -DTEST_ENCODING_EXE=${TEST_ENCODING_EXE} -P ${RunCMake_SOURCE_DIR}/Encoding.cmake)
+  run_cmake_script(EncodingUTF-8 -DTEST_ENCODING_EXE=${TEST_ENCODING_EXE})
+  run_cmake_script(EncodingUTF8 -DTEST_ENCODING_EXE=${TEST_ENCODING_EXE})
 endif()
 
 if(EXIT_CODE_EXE)
-- 
cgit v0.12