svn commit: r1919490 - /subversion/trunk/build/run_tests.py

Author: rinrab
Date: Wed Jul 24 08:48:53 2024
New Revision: 1919490

URL: http://svn.apache.org/viewvc?rev=1919490&view=rev
Log:
Add --tools-bin argument to the run_tests.py script and pass it to the tests.

This modification is related to the fix with --tools-bin in testmain, done
in r1919489 and also will be used for tests with CMake.

* build/run_tests.py
  (usage): Add help for the --tools-bin argument.
  (_init_py_tests): Pass option for tools binary directory into the tests.
  (create_parser): Read --tools-bin argument into tools_bin field.

Modified:
    subversion/trunk/build/run_tests.py

Modified: subversion/trunk/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/run_tests.py?rev=1919490&r1=1919489&r2=1919490&view=diff
==============================================================================
--- subversion/trunk/build/run_tests.py (original)
+++ subversion/trunk/build/run_tests.py Wed Jul 24 08:48:53 2024
@@ -24,8 +24,8 @@
 #
 
 '''usage: python run_tests.py
-            [--verbose] [--log-to-stdout] [--cleanup] [--bin=<path>]
-            [--parallel | --parallel=<n>] [--global-scheduler]
+            [--verbose] [--log-to-stdout] [--cleanup] [--tools-bin=<path>]
+            [--bin=<path>] [--parallel | --parallel=<n>] [--global-scheduler]
             [--url=<base-url>] [--http-library=<http-library>] [--enable-sasl]
             [--fs-type=<fs-type>] [--fsfs-packing] [--fsfs-sharding=<n>]
             [--list] [--milestone-filter=<regex>] [--mode-filter=<type>]
@@ -285,6 +285,8 @@ class TestHarness:
         cmdline.append('--parallel')
       else:
         cmdline.append('--parallel-instances=%d' % self.opts.parallel)
+    if self.opts.tools_bin is not None:
+      cmdline.append('--tools-bin=%s' % self.opts.tools_bin)
     if self.opts.svn_bin is not None:
       cmdline.append('--bin=%s' % self.opts.svn_bin)
     if self.opts.url is not None:
@@ -1062,6 +1064,8 @@ def create_parser():
                     help="Make svn use this DAV library (neon or serf)")
   parser.add_option('--bin', action='store', dest='svn_bin',
                     help='Use the svn binaries installed in this path')
+  parser.add_option('--tools-bin', action='store', dest='tools_bin',
+                    help='Use the svn tools installed in this path')
   parser.add_option('--fsfs-sharding', action='store', type='int',
                     help='Default shard size (for fsfs)')
   parser.add_option('--fsfs-packing', action='store_true',