Author: futatuki
Date: Thu Apr 1 14:25:45 2021
New Revision: 1888273
URL: http://svn.apache.org/viewvc?rev=1888273&view=rev
Log:
Follow up to r188732: Fix the invocation of svneditor.sh on out of tree build.
* subversion/tests/cmdline/svneditor.sh.in ():
Specify the absolute path for svneditor.py, instead of relative path from
the script on execution.
* subversion/tests/cmdline/svntest/main.py (svneditor_script):
Build the absolute path by using absolute path of current working directory
on execution, like entries-dump and lock-helper, instead of using path of
module self.
Found by: julianfoad
Tested by: julianfoad
Modified:
subversion/trunk/subversion/tests/cmdline/svneditor.sh.in
subversion/trunk/subversion/tests/cmdline/svntest/main.py
Modified: subversion/trunk/subversion/tests/cmdline/svneditor.sh.in
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svneditor.sh.in?rev=1888273&r1=1888272&r2=1888273&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svneditor.sh.in (original)
+++ subversion/trunk/subversion/tests/cmdline/svneditor.sh.in Thu Apr 1
14:25:45 2021
@@ -25,5 +25,4 @@
# under the License.
######################################################################
-script_dir=`dirname "$0"`
-exec @PYTHON@ "$script_dir"/svneditor.py "$@"
+exec @PYTHON@ "@abs_srcdir@"/svneditor.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=1888273&r1=1888272&r2=1888273&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Thu Apr 1
14:25:45 2021
@@ -129,7 +129,10 @@ else:
if windows:
svneditor_script = os.path.join(sys.path[0], 'svneditor.bat')
else:
- svneditor_script = os.path.join(sys.path[0], 'svneditor.sh')
+ # This script is in the build tree, not in the source tree.
+ svneditor_script = os.path.join(os.path.dirname(
+ os.path.dirname(os.path.abspath('.'))),
+ 'tests/cmdline/svneditor.sh')
# Username and password used by the working copies
wc_author = 'jrandom'
