From 60433fc6e82267011ff8cb62feb7611c696c87c0 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 6 Mar 2024 13:20:31 -0500
Subject: [PATCH] Tests: Generalize ctest tests-from-file test cases

---
 Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake     |  8 ++++----
 ...ile-stdout.txt => TestsFromFile-exclude-stdout.txt} |  0
 ...ile-stdout.txt => TestsFromFile-include-stdout.txt} |  0
 Tests/RunCMake/ctest_test/RunCMakeTest.cmake           | 10 +++++-----
 ...ILE-stdout.txt => TestsFromFile-exclude-stdout.txt} |  0
 ...ILE-stdout.txt => TestsFromFile-include-stdout.txt} |  0
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename Tests/RunCMake/CTestCommandLine/{TestsFromFile-exclude-from-file-stdout.txt => TestsFromFile-exclude-stdout.txt} (100%)
 rename Tests/RunCMake/CTestCommandLine/{TestsFromFile-tests-from-file-stdout.txt => TestsFromFile-include-stdout.txt} (100%)
 rename Tests/RunCMake/ctest_test/{TestsFromFile-EXCLUDE_FROM_FILE-stdout.txt => TestsFromFile-exclude-stdout.txt} (100%)
 rename Tests/RunCMake/ctest_test/{TestsFromFile-INCLUDE_FROM_FILE-stdout.txt => TestsFromFile-include-stdout.txt} (100%)

diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
index c09fff833c..e4a92ad716 100644
--- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
@@ -208,7 +208,7 @@ endfunction()
 run_SkipRegexFoundTest()
 
 
-function(run_TestsFromFileTest arg)
+function(run_TestsFromFileTest case)
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/TestsFromFile)
   set(RunCMake_TEST_NO_CLEAN 1)
   file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
@@ -219,10 +219,10 @@ add_test(Test1 \"${CMAKE_COMMAND}\" -E echo \"test1\")
 add_test(Test2 \"${CMAKE_COMMAND}\" -E echo \"test2\")
 add_test(Test11 \"${CMAKE_COMMAND}\" -E echo \"test11\")
 ")
-  run_cmake_command(TestsFromFile-${arg} ${CMAKE_CTEST_COMMAND} --${arg} ${RunCMake_SOURCE_DIR}/TestsFromFile-TestList.txt )
+  run_cmake_command(TestsFromFile-${case} ${CMAKE_CTEST_COMMAND} ${ARGN})
 endfunction()
-run_TestsFromFileTest(tests-from-file)
-run_TestsFromFileTest(exclude-from-file)
+run_TestsFromFileTest(include --tests-from-file ${RunCMake_SOURCE_DIR}/TestsFromFile-TestList.txt)
+run_TestsFromFileTest(exclude --exclude-from-file ${RunCMake_SOURCE_DIR}/TestsFromFile-TestList.txt)
 
 
 function(run_SerialFailed)
diff --git a/Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-from-file-stdout.txt b/Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-from-file-stdout.txt
rename to Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-stdout.txt
diff --git a/Tests/RunCMake/CTestCommandLine/TestsFromFile-tests-from-file-stdout.txt b/Tests/RunCMake/CTestCommandLine/TestsFromFile-include-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestCommandLine/TestsFromFile-tests-from-file-stdout.txt
rename to Tests/RunCMake/CTestCommandLine/TestsFromFile-include-stdout.txt
diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
index 4413a4d4e7..d4250c44d9 100644
--- a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
@@ -165,18 +165,18 @@ run_stop_on_failure()
 
 
 # test include/exclude tests from file
-function(run_tests_from_file mode)
-  set(CASE_CTEST_TEST_ARGS ${mode} ${RunCMake_SOURCE_DIR}/TestsFromFile-TestList.txt)
+function(run_tests_from_file case)
+  set(CASE_CTEST_TEST_ARGS ${ARGN})
   set(CASE_CMAKELISTS_SUFFIX_CODE [[
 add_test(NAME Test1 COMMAND ${CMAKE_COMMAND} -E true)
 add_test(NAME Test2 COMMAND ${CMAKE_COMMAND} -E true)
 add_test(NAME Test11 COMMAND ${CMAKE_COMMAND} -E true)
   ]])
 
-  run_ctest(TestsFromFile-${mode})
+  run_ctest(TestsFromFile-${case})
 endfunction()
-run_tests_from_file(INCLUDE_FROM_FILE)
-run_tests_from_file(EXCLUDE_FROM_FILE)
+run_tests_from_file(include INCLUDE_FROM_FILE ${RunCMake_SOURCE_DIR}/TestsFromFile-TestList.txt)
+run_tests_from_file(exclude EXCLUDE_FROM_FILE ${RunCMake_SOURCE_DIR}/TestsFromFile-TestList.txt)
 
 
 # Make sure environment gets logged
diff --git a/Tests/RunCMake/ctest_test/TestsFromFile-EXCLUDE_FROM_FILE-stdout.txt b/Tests/RunCMake/ctest_test/TestsFromFile-exclude-stdout.txt
similarity index 100%
rename from Tests/RunCMake/ctest_test/TestsFromFile-EXCLUDE_FROM_FILE-stdout.txt
rename to Tests/RunCMake/ctest_test/TestsFromFile-exclude-stdout.txt
diff --git a/Tests/RunCMake/ctest_test/TestsFromFile-INCLUDE_FROM_FILE-stdout.txt b/Tests/RunCMake/ctest_test/TestsFromFile-include-stdout.txt
similarity index 100%
rename from Tests/RunCMake/ctest_test/TestsFromFile-INCLUDE_FROM_FILE-stdout.txt
rename to Tests/RunCMake/ctest_test/TestsFromFile-include-stdout.txt