Author: ivan
Date: Wed Jul  1 13:34:37 2026
New Revision: 1935767

Log:
On the xml-schema-validation-improvements branch:

Rename '--enable-xml-schema-validation' argument to '--check-xml-schema':
it is shorter, but still clear enough.

* .github/workflows/autoconf.yml
  (Run tests): Use CHECK_XML_SCHEMA=1.

* .github/workflows/cmake.yml
  (Configure CMake): Use '--check-xml-schema'.

* build/run_tests.py
  (TestHarness._init_py_tests, create_parser): Rename
   '--enable-xml-schema-validation' argument to '--check-xml-schema'

* INSTALL
  (G.1 Validating XML output): Update to '--check-xml-schema'.
  (G.2 Running the test suite under the autoconf/make build system): Update to
   CHECK_XML_SCHEMA=1.

* Makefile.in
  (check): Rename ENABLE_XML_SCHEMA_VALIDATION to CHECK_XML_SCHEMA.

* subversion/tests/cmdline/svntest/main.py
  (is_xml_schema_validation_enabled): Update to use options.check_xml_schema.
  (TestSpawningThread.run_one, _create_parser): Rename
   '--enable-xml-schema-validation' argument to '--check-xml-schema'

Modified:
   
subversion/branches/xml-schema-validation-improvements/.github/workflows/autoconf.yml
   
subversion/branches/xml-schema-validation-improvements/.github/workflows/cmake.yml
   subversion/branches/xml-schema-validation-improvements/INSTALL
   subversion/branches/xml-schema-validation-improvements/Makefile.in
   subversion/branches/xml-schema-validation-improvements/build/run_tests.py
   
subversion/branches/xml-schema-validation-improvements/subversion/tests/cmdline/svntest/main.py

Modified: 
subversion/branches/xml-schema-validation-improvements/.github/workflows/autoconf.yml
==============================================================================
--- 
subversion/branches/xml-schema-validation-improvements/.github/workflows/autoconf.yml
       Wed Jul  1 12:53:30 2026        (r1935766)
+++ 
subversion/branches/xml-schema-validation-improvements/.github/workflows/autoconf.yml
       Wed Jul  1 13:34:37 2026        (r1935767)
@@ -170,7 +170,7 @@ jobs:
         run: |
           make ${{matrix.check-target}} PARALLEL=6 \
               APACHE_MPM="${{ steps.platform.outputs.apache-mpm }}" \
-              ENABLE_XML_SCHEMA_VALIDATION=1
+              CHECK_XML_SCHEMA=1
 
       - name: Archive test logs
         if: always()

Modified: 
subversion/branches/xml-schema-validation-improvements/.github/workflows/cmake.yml
==============================================================================
--- 
subversion/branches/xml-schema-validation-improvements/.github/workflows/cmake.yml
  Wed Jul  1 12:53:30 2026        (r1935766)
+++ 
subversion/branches/xml-schema-validation-improvements/.github/workflows/cmake.yml
  Wed Jul  1 13:34:37 2026        (r1935767)
@@ -214,7 +214,7 @@ jobs:
           -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/installdir
           -DVCPKG_TARGET_TRIPLET=${{ matrix.vcpkg_triplet }}
           -DSVN_TEST_CONFIGURE_FOR_PARALLEL=ON
-          -DSVN_TEST_COMMAND_ARGUMENTS="--enable-xml-schema-validation"
+          -DSVN_TEST_COMMAND_ARGUMENTS="--check-xml-schema"
           -DPython3_ROOT_DIR="${{ steps.platform.outputs.python_root }}"
           -DPython3_FIND_REGISTRY=NEVER
           -DPython3_FIND_STRATEGY=LOCATION

Modified: subversion/branches/xml-schema-validation-improvements/INSTALL
==============================================================================
--- subversion/branches/xml-schema-validation-improvements/INSTALL      Wed Jul 
 1 12:53:30 2026        (r1935766)
+++ subversion/branches/xml-schema-validation-improvements/INSTALL      Wed Jul 
 1 13:34:37 2026        (r1935767)
@@ -1278,7 +1278,7 @@ II.   INSTALLATION
       will always verify that the output is valid XML, however it is also
       possible to check the output against the expected XML schema. To do
       this, install the lxml and rnc2rng Python modules and start the tests
-      using the --enable-xml-schema-validation argument.
+      using the --check-xml-schema argument.
 
 
   G.2 Running the test suite under the autoconf/make build system
@@ -1304,9 +1304,9 @@ II.   INSTALLATION
       - APACHE_MPM=mpm type
         Used for davautocheck, run the test using the specified Apache httpd
         MPM engine
-      - ENABLE_XML_SCHEMA_VALIDATION
+      - CHECK_XML_SCHEMA
         If this option is defined, full XML schema validation will be
-        performed, see the --enable-xml-schema-validation option above.
+        performed, see the --check-xml-schema option above.
 
 
   G.3 Running the test suite under the CMake build system

Modified: subversion/branches/xml-schema-validation-improvements/Makefile.in
==============================================================================
--- subversion/branches/xml-schema-validation-improvements/Makefile.in  Wed Jul 
 1 12:53:30 2026        (r1935766)
+++ subversion/branches/xml-schema-validation-improvements/Makefile.in  Wed Jul 
 1 13:34:37 2026        (r1935767)
@@ -651,8 +651,8 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
          if test "$(VALGRIND_OPTS)" != ""; then                             \
            flags="--valgrind-opts $(VALGRIND_OPTS) $$flags";                \
          fi;                                                                \
-         if test "$(ENABLE_XML_SCHEMA_VALIDATION)" != ""; then             \
-           flags="--enable-xml-schema-validation $$flags";                 \
+         if test "$(CHECK_XML_SCHEMA)" != ""; then             \
+           flags="--check-xml-schema $$flags";                 \
          fi;                                                                \
          LD_LIBRARY_PATH='$(auth_plugin_dirs):$(LD_LIBRARY_PATH)'           \
          $(PYTHON) $(top_srcdir)/build/run_tests.py                         \

Modified: 
subversion/branches/xml-schema-validation-improvements/build/run_tests.py
==============================================================================
--- subversion/branches/xml-schema-validation-improvements/build/run_tests.py   
Wed Jul  1 12:53:30 2026        (r1935766)
+++ subversion/branches/xml-schema-validation-improvements/build/run_tests.py   
Wed Jul  1 13:34:37 2026        (r1935767)
@@ -315,8 +315,8 @@ class TestHarness:
       cmdline.append('--valgrind=%s' % self.opts.valgrind)
     if self.opts.valgrind_opts is not None:
       cmdline.append('--valgrind-opts=%s' % self.opts.valgrind_opts)
-    if self.opts.enable_xml_schema_validation is not None:
-      cmdline.append('--enable-xml-schema-validation')
+    if self.opts.check_xml_schema is not None:
+      cmdline.append('--check-xml-schema')
 
     self.py_test_cmdline = cmdline
 
@@ -1091,7 +1091,7 @@ def create_parser():
                     help='programs to run under valgrind')
   parser.add_option('--valgrind-opts', action='store',
                     help='options to pass valgrind')
-  parser.add_option('--enable-xml-schema-validation', action='store_true',
+  parser.add_option('--check-xml-schema', action='store_true',
                     help='Enable extended XML schema validation')
 
   parser.set_defaults(set_log_level=None)

Modified: 
subversion/branches/xml-schema-validation-improvements/subversion/tests/cmdline/svntest/main.py
==============================================================================
--- 
subversion/branches/xml-schema-validation-improvements/subversion/tests/cmdline/svntest/main.py
     Wed Jul  1 12:53:30 2026        (r1935766)
+++ 
subversion/branches/xml-schema-validation-improvements/subversion/tests/cmdline/svntest/main.py
     Wed Jul  1 13:34:37 2026        (r1935767)
@@ -1744,7 +1744,7 @@ def is_remote_http_connection_allowed():
   return options.allow_remote_http_connection
 
 def is_xml_schema_validation_enabled():
-  return options.enable_xml_schema_validation
+  return options.check_xml_schema
 
 
 def wc_format(ver=None):
@@ -1856,8 +1856,8 @@ class TestSpawningThread(threading.Threa
       args.append('--valgrind=' + options.valgrind)
     if options.valgrind_opts:
       args.append('--valgrind-opts=' + options.valgrind_opts)
-    if options.enable_xml_schema_validation:
-      args.append('--enable-xml-schema-validation')
+    if options.check_xml_schema:
+      args.append('--check-xml-schema')
 
     result, stdout_lines, stderr_lines = spawn_process(command, 0, False, None,
                                                        *args)
@@ -2302,7 +2302,7 @@ def _create_parser(usage=None):
                     help='programs to run under valgrind')
   parser.add_option('--valgrind-opts', action='store',
                     help='options to pass to valgrind')
-  parser.add_option('--enable-xml-schema-validation', action='store_true',
+  parser.add_option('--check-xml-schema', action='store_true',
                     help='Enable extended XML schema validation')
 
   # most of the defaults are None, but some are other values, set them here

Reply via email to