Author: rinrab
Date: Wed Jul 24 08:42:34 2024
New Revision: 1919489
URL: http://svn.apache.org/viewvc?rev=1919489&view=rev
Log:
py-tests: Correctly search for tools in install layout.
There is already a support for the install layout in the Python test suite,
but some tools wasn't supporting it yet. This might cause an error like
entriesdump not found, so tests fail with this binaries layout. Additionally
there is also a support of some binaries in install layout, but others still
not working.
Install layout means that the binaries are installed in a single directory.
This kind of layout will be also used for build with CMake, while with
autoconf and gen-win build systems they are installed each in their directory.
The current fix will add the checks for the --tools-bin --bin argument for
all binaries in the main of the Python test suite and later using the binaries
as install layout if so.
[in subversion/tests/cmdline/svntest]
* main.py
(execute_tests, entry): Making some variables to be global.
(execute_tests, binary paths fixup): Handle all binaries for install layout
inside the checks for --bin and --tools-bin arguments.
Modified:
subversion/trunk/subversion/tests/cmdline/svntest/main.py
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1919489&r1=1919488&r2=1919489&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Wed Jul 24
08:42:34 2024
@@ -2496,6 +2496,12 @@ def execute_tests(test_list, serial_only
global svnmucc_binary
global svnauthz_binary
global svnauthz_validate_binary
+ global svnfsfs_binary
+ global entriesdump_binary
+ global lock_helper_binary
+ global atomic_ra_revprop_change_binary
+ global wc_lock_tester_binary
+ global wc_incomplete_tester_binary
global options
if test_name:
@@ -2597,11 +2603,20 @@ def execute_tests(test_list, serial_only
'svndumpfilter' + _exe)
svnversion_binary = os.path.join(options.svn_bin, 'svnversion' + _exe)
svnmucc_binary = os.path.join(options.svn_bin, 'svnmucc' + _exe)
+ svnfsfs_binary = os.path.join(options.svn_bin, 'svnfsfs' + _exe)
if options.tools_bin:
svnauthz_binary = os.path.join(options.tools_bin, 'svnauthz' + _exe)
svnauthz_validate_binary = os.path.join(options.tools_bin,
'svnauthz-validate' + _exe)
+ entriesdump_binary = os.path.join(options.tools_bin, 'entries-dump' + _exe)
+ lock_helper_binary = os.path.join(options.tools_bin, 'lock-helper' + _exe)
+ atomic_ra_revprop_change_binary = os.path.join(options.tools_bin,
+ 'atomic-ra-revprop-change'
+ _exe)
+ wc_lock_tester_binary = os.path.join(options.tools_bin,
+ 'wc-lock-tester' + _exe)
+ wc_incomplete_tester_binary = os.path.join(options.tools_bin,
+ 'wc-incomplete-tester' + _exe)
######################################################################
