svn commit: r1905380 - in /subversion/trunk: ./ win-tests.py

[ko...@apache.org]

Author: kotkov
Date: Fri Nov 18 13:40:21 2022
New Revision: 1905380

URL: http://svn.apache.org/viewvc?rev=1905380&view=rev
Log:
Cherry-pick r1899654 from the 'pristines-on-demand-on-mwf' branch.

[[[
Add '--wc-format-version' option to win-tests.py, and pass it to run_tests.py.
]]]

Modified:
    subversion/trunk/   (props changed)
    subversion/trunk/win-tests.py

Propchange: subversion/trunk/
------------------------------------------------------------------------------
  Merged /subversion/branches/pristines-on-demand-on-mwf:r1899654

Modified: subversion/trunk/win-tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/win-tests.py?rev=1905380&r1=1905379&r2=1905380&view=diff
==============================================================================
--- subversion/trunk/win-tests.py (original)
+++ subversion/trunk/win-tests.py Fri Nov 18 13:40:21 2022
@@ -114,6 +114,7 @@ def _usage_exit():
   print("  --fsfs-sharding        : Specify shard size (for fsfs)")
   print("  --fsfs-packing         : Run 'svnadmin pack' automatically")
   print("  --fsfs-compression=VAL : Set compression type to VAL (for fsfs)")
+  print("  --wc-format-version=VAL: Set the WC format version")
   print("  -q, --quiet            : Deprecated; this is the default.")
   print("                           Use --set-log-level instead.")
 
@@ -145,7 +146,7 @@ opts, args = my_getopt(sys.argv[1:], 'hr
                         'log-to-stdout', 'mode-filter=', 'milestone-filter=',
                         'ssl-cert=', 'exclusive-wc-locks', 'memcached-server=',
                         'skip-c-tests', 'dump-load-cross-check', 'memcached-dir=',
-                        'fsfs-compression=',
+                        'fsfs-compression=', 'wc-format-version=',
                         ])
 if len(args) > 1:
   print('Warning: non-option arguments after the first one will be ignored')
@@ -193,6 +194,7 @@ skip_c_tests = None
 dump_load_cross_check = None
 fsfs_compression = None
 fsfs_dir_deltification = None
+wc_format_version = None
 
 for opt, val in opts:
   if opt in ('-h', '--help'):
@@ -291,6 +293,8 @@ for opt, val in opts:
     fsfs_compression = val
   elif opt == '--fsfs-dir-deltification':
     fsfs_dir_deltification = val
+  elif opt == '--wc-format-version':
+    wc_format_version = val
 
 # Calculate the source and test directory names
 abs_srcdir = os.path.abspath("")
@@ -1132,6 +1136,7 @@ if not test_javahl and not test_swig:
   opts.dump_load_cross_check = dump_load_cross_check
   opts.fsfs_compression = fsfs_compression
   opts.fsfs_dir_deltification = fsfs_dir_deltification
+  opts.wc_format_version = wc_format_version
   th = run_tests.TestHarness(abs_srcdir, abs_builddir,
                              log_file, fail_log_file, opts)
   old_cwd = os.getcwd()