Author: breser
Date: Fri Dec 6 19:54:50 2013
New Revision: 1548706
URL: http://svn.apache.org/r1548706
Log:
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>
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=1548706&r1=1548705&r2=1548706&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Fri Dec 6
19:54:50 2013
@@ -141,8 +141,9 @@ stack_trace_regexp = r'(?:.*subversion[\
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
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
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)
