Hi,
I've noticed a small discrepancy: around trunk@r1547889, the core of the test
suite (subversion/tests/cmdline/svntest/main.py) always ignores the --bin
option for the svnrdump binary.
So, if you make a fresh checkout and try to run svnrdump_tests.py against the
installed version of Subversion, the test runner will complain about the
missing svnrdump binary:
[[[
./svnrdump_tests.py --bin=/usr/bin
... (in run_svnrdump)
OSError: [Errno 2] No such file or directory
FAIL: svnrdump_tests.py 1: dump: standard sbox repos
]]]
I've attached a patch to fix this issue. AFAIK [1], SVNKit does not include
the "j" version of svnrdump, so I did not touch the part of the setup that
handles the --use-jsvn option. Log message:
[[[
Do not ignore --bin parameter for svnrdump when running Python tests.
* subversion/tests/cmdline/svntest/main.py
(svnrdump_binary): Update obsolete comment.
(execute_tests): Override default svnrdump path when --bin option is set.
Patch by: Evgeny Kotkov <evgeny.kotkov{_AT_}visualsvn.com>
]]]
[1] http://svn.svnkit.com/repos/svnkit/trunk/svnkit-cli/build.gradle
Thanks and regards,
Evgeny Kotkov
Index: subversion/tests/cmdline/svntest/main.py
===================================================================
--- subversion/tests/cmdline/svntest/main.py (revision 1547889)
+++ subversion/tests/cmdline/svntest/main.py (working copy)
@@ -141,8 +141,9 @@ stack_trace_regexp = r'(?:.*subversion[\\//].*\.c:
os.environ['LC_ALL'] = 'C'
######################################################################
-# The locations of the svn, svnadmin and svnlook binaries, relative to
-# the only scripts that import this file right now (they live in ../).
+# The locations of the svn binaries (svn, svnadmin, svnlook and others),
+# relative to the only scripts that import this file right now (they
+# live in ../).
# Use --bin to override these defaults.
svn_binary = os.path.abspath('../../svn/svn' + _exe)
svnadmin_binary = os.path.abspath('../../svnadmin/svnadmin' + _exe)
@@ -1959,6 +1960,7 @@ def execute_tests(test_list, serial_only = False,
global svn_binary
global svnadmin_binary
global svnlook_binary
+ global svnrdump_binary
global svnsync_binary
global svndumpfilter_binary
global svnversion_binary
@@ -2076,6 +2078,7 @@ def execute_tests(test_list, serial_only = False,
svn_binary = os.path.join(options.svn_bin, 'svn' + _exe)
svnadmin_binary = os.path.join(options.svn_bin, 'svnadmin' + _exe)
svnlook_binary = os.path.join(options.svn_bin, 'svnlook' + _exe)
+ svnrdump_binary = os.path.join(options.svn_bin, 'svnrdump' + _exe)
svnsync_binary = os.path.join(options.svn_bin, 'svnsync' + _exe)
svndumpfilter_binary = os.path.join(options.svn_bin,
'svndumpfilter' + _exe)
