You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by fu...@apache.org on 2021/03/08 12:01:00 UTC
svn commit: r1887324 - in /subversion/trunk: configure.ac
subversion/tests/cmdline/ subversion/tests/cmdline/svneditor.py
subversion/tests/cmdline/svneditor.sh.in
subversion/tests/cmdline/svntest/main.py
Author: futatuki
Date: Mon Mar 8 12:01:00 2021
New Revision: 1887324
URL: http://svn.apache.org/viewvc?rev=1887324&view=rev
Log:
tests: Add launcher for svneditor.py with specfied Python at configure.
* configure.ac:
Add subversion/tests/cmdline/svneditor.sh to SVN_CONFIG_SCRIPT.
* subversion/tests/cmdline (svn:ignore): ignore svneditor.sh.
* subversion/tests/cmdline/svneditor.sh.in: New script tempate,
launching svneditor.py via @PYTHON@.
* subversion/tests/cmdline/svneditor.py:
- Drop svn:executable.
- Remove shebang line.
Review by: danielsh
Added:
subversion/trunk/subversion/tests/cmdline/svneditor.sh.in (with props)
Modified:
subversion/trunk/configure.ac
subversion/trunk/subversion/tests/cmdline/ (props changed)
subversion/trunk/subversion/tests/cmdline/svneditor.py (contents, props changed)
subversion/trunk/subversion/tests/cmdline/svntest/main.py
Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1887324&r1=1887323&r2=1887324&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Mon Mar 8 12:01:00 2021
@@ -1769,6 +1769,7 @@ done
SVN_CONFIG_SCRIPT(tools/backup/hot-backup.py)
SVN_CONFIG_SCRIPT(tools/hook-scripts/commit-access-control.pl)
+SVN_CONFIG_SCRIPT(subversion/tests/cmdline/svneditor.sh)
SVN_CONFIG_SCRIPT(subversion/bindings/swig/perl/native/Makefile.PL)
if test -e packages/solaris/pkginfo.in; then
SVN_CONFIG_SCRIPT(packages/solaris/pkginfo)
Propchange: subversion/trunk/subversion/tests/cmdline/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 8 12:01:00 2021
@@ -11,3 +11,4 @@ atomic-ra-revprop-change
.libs
.davautocheck.sh.stop
lock-helper
+svneditor.sh
Modified: subversion/trunk/subversion/tests/cmdline/svneditor.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svneditor.py?rev=1887324&r1=1887323&r2=1887324&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svneditor.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svneditor.py Mon Mar 8 12:01:00 2021
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
#
# svneditor.py: a mock $SVN_EDITOR for the Subversion test suite
#
Propchange: subversion/trunk/subversion/tests/cmdline/svneditor.py
('svn:executable' removed)
Added: subversion/trunk/subversion/tests/cmdline/svneditor.sh.in
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svneditor.sh.in?rev=1887324&view=auto
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svneditor.sh.in (added)
+++ subversion/trunk/subversion/tests/cmdline/svneditor.sh.in Mon Mar 8 12:01:00 2021
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# svneditor.sh.in: a launcher of svneditor.py, used as $SVN_EDITOR
+# for the Subversion test suite
+#
+# Subversion is a tool for revision control.
+# See http://subversion.apache.org for more information.
+#
+# ====================================================================
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+######################################################################
+
+script_dir=`dirname "$0"`
+exec @PYTHON@ "$script_dir"/svneditor.py "$@"
Propchange: subversion/trunk/subversion/tests/cmdline/svneditor.sh.in
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/trunk/subversion/tests/cmdline/svneditor.sh.in
------------------------------------------------------------------------------
svn:executable = *
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1887324&r1=1887323&r2=1887324&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Mon Mar 8 12:01:00 2021
@@ -129,7 +129,7 @@ else:
if windows:
svneditor_script = os.path.join(sys.path[0], 'svneditor.bat')
else:
- svneditor_script = os.path.join(sys.path[0], 'svneditor.py')
+ svneditor_script = os.path.join(sys.path[0], 'svneditor.sh')
# Username and password used by the working copies
wc_author = 'jrandom'