You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2012/05/09 12:53:04 UTC
svn commit: r1336070 - in /subversion/branches/1.7.x: ./ STATUS
subversion/tests/cmdline/svntest/main.py
Author: svn-role
Date: Wed May 9 10:53:04 2012
New Revision: 1336070
URL: http://svn.apache.org/viewvc?rev=1336070&view=rev
Log:
Merge r1335555 from trunk:
* r1335555
Fix running the test suite with jsvn.
Justification:
Obvious fix. Tmate folks need this for SVNKit.
Votes:
+1: stsp, danielsh, rhuijben
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/tests/cmdline/svntest/main.py
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1335555
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1336070&r1=1336069&r2=1336070&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed May 9 10:53:04 2012
@@ -67,13 +67,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1335555
- Fix running the test suite with jsvn.
- Justification:
- Obvious fix. Tmate folks need this for SVNKit.
- Votes:
- +1: stsp, danielsh, rhuijben
-
* r1291797, r1291810
On Windows detect where perl is installed and add this information to the
include and lib directory settings of the swig-perl projects.
Modified: subversion/branches/1.7.x/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/svntest/main.py?rev=1336070&r1=1336069&r2=1336070&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/branches/1.7.x/subversion/tests/cmdline/svntest/main.py Wed May 9 10:53:04 2012
@@ -1710,7 +1710,7 @@ def execute_tests(test_list, serial_only
'jsvndumpfilter' + _bat)
svnversion_binary = os.path.join(options.svn_bin,
'jsvnversion' + _bat)
- svnversion_binary = os.path.join(options.svn_bin, 'jsvnmucc' + _bat)
+ svnmucc_binary = os.path.join(options.svn_bin, 'jsvnmucc' + _bat)
else:
if options.svn_bin:
svn_binary = os.path.join(options.svn_bin, 'svn' + _exe)