svn commit: r1936384 - subversion/branches/1.15.x-r1936304

Author: ivan
Date: Mon Jul 20 14:14:40 2026
New Revision: 1936384

Log:
On the 1.15.x-r1936304 branch: Merge r1936304 from trunk.

Modified:
   subversion/branches/1.15.x-r1936304/   (props changed)
   subversion/branches/1.15.x-r1936304/CMakeLists.txt

Modified: subversion/branches/1.15.x-r1936304/CMakeLists.txt
==============================================================================
--- subversion/branches/1.15.x-r1936304/CMakeLists.txt	Mon Jul 20 14:06:46 2026	(r1936383)
+++ subversion/branches/1.15.x-r1936304/CMakeLists.txt	Mon Jul 20 14:14:40 2026	(r1936384)
@@ -829,21 +829,28 @@ if(SVN_ENABLE_TESTS)
 
     file(MAKE_DIRECTORY "${test_root}/subversion/tests/cmdline")
 
+    set(test_args
+      --bin ${binary_dir}
+      --tools-bin ${binary_dir}
+      --verbose
+      --log-to-stdout
+      --set-log-level=WARNING
+    )
+    if(SVN_TEST_CHECK_XML_SCHEMA)
+      list(APPEND test_args --check-xml-schema)
+    endif()
+    list(APPEND test_args
+      ${SVN_TEST_COMMAND_ARGUMENTS}
+      ${CMAKE_CURRENT_SOURCE_DIR}
+      ${test_root}
+      "${prog}"
+    )
+
     add_test(
       NAME
         "${name}"
       COMMAND
-        "${Python3_EXECUTABLE}" "${run_tests_script}"
-        --bin ${binary_dir}
-        --tools-bin ${binary_dir}
-        --verbose
-        --log-to-stdout
-        --set-log-level=WARNING
-        $<$<BOOL:${SVN_TEST_CHECK_XML_SCHEMA}>:--check-xml-schema>
-        ${SVN_TEST_COMMAND_ARGUMENTS}
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${test_root}
-        "${prog}"
+        "${Python3_EXECUTABLE}" "${run_tests_script}" ${test_args}
       WORKING_DIRECTORY
         ${test_root}
     )