svn commit: r1936776 - subversion/branches/1.15.x

Author: svn-role
Date: Sat Aug  1 04:01:15 2026
New Revision: 1936776

Log:
Merge the 1.15.x-r1936304 branch:

* r1936304
  cmake: Follow-up to r1935776, fix all tests via run_tests.py failing
  with SVN_TEST_CHECK_XML_SCHEMA=OFF.
  Justification:
    Ensure ctest work
  Branch:
    1.15.x-r1936304
  Votes:
    +1: ivan, dsahlberg, kotkov

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

Modified: subversion/branches/1.15.x/CMakeLists.txt
==============================================================================
--- subversion/branches/1.15.x/CMakeLists.txt	Sat Aug  1 04:01:00 2026	(r1936775)
+++ subversion/branches/1.15.x/CMakeLists.txt	Sat Aug  1 04:01:15 2026	(r1936776)
@@ -805,21 +805,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}
     )

Modified: subversion/branches/1.15.x/STATUS
==============================================================================
--- subversion/branches/1.15.x/STATUS	Sat Aug  1 04:01:00 2026	(r1936775)
+++ subversion/branches/1.15.x/STATUS	Sat Aug  1 04:01:15 2026	(r1936776)
@@ -67,16 +67,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
-* r1936304
-  cmake: Follow-up to r1935776, fix all tests via run_tests.py failing
-  with SVN_TEST_CHECK_XML_SCHEMA=OFF.
-  Justification:
-    Ensure ctest work
-  Branch:
-    1.15.x-r1936304
-  Votes:
-    +1: ivan, dsahlberg, kotkov
-
 * r1936337
   Parse dumpfile property length as unsigned integers. This rejects
   negative lengths such as "V -1" before they are cast to apr_size_t.