Author: rinrab Date: Thu Sep 26 13:22:09 2024 New Revision: 1920955 URL: http://svn.apache.org/viewvc?rev=1920955&view=rev Log: Fix command-line tests on Linux by removing configuration of svneditor.sh script.
See also 'Removing configuration of svneditor.sh script?' thread on dev@ [1]. * configure.ac (configscripts): Do not configure 'svneditor.sh' script. * subversion/tests/cmdline (svn:ignore): Remove 'svneditor.sh' from ignores. * subversion/tests/cmdline/svneditor.sh: Rename from svneditor.sh.in and... (python path): Retrieve it from SVN_TEST_PYTHON environment variable instead of configuring it. (source dir): Using `$(dirname $0)` shell magic for determining source dir, instead of configuring it. * subversion/tests/cmdline/svneditor.sh.in: Renamed to svneditor.sh. [1] https://lists.apache.org/thread/b64t53r5055tv2s2b37r4wpk4qtw00y8 Reviewed by: jun66j5 Added: subversion/trunk/subversion/tests/cmdline/svneditor.sh - copied, changed from r1920954, subversion/trunk/subversion/tests/cmdline/svneditor.sh.in Removed: subversion/trunk/subversion/tests/cmdline/svneditor.sh.in Modified: subversion/trunk/configure.ac subversion/trunk/subversion/tests/cmdline/ (props changed) Modified: subversion/trunk/configure.ac URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1920955&r1=1920954&r2=1920955&view=diff ============================================================================== --- subversion/trunk/configure.ac (original) +++ subversion/trunk/configure.ac Thu Sep 26 13:22:09 2024 @@ -1764,7 +1764,6 @@ 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 Thu Sep 26 13:22:09 2024 @@ -11,4 +11,3 @@ atomic-ra-revprop-change .libs .davautocheck.sh.stop lock-helper -svneditor.sh Copied: subversion/trunk/subversion/tests/cmdline/svneditor.sh (from r1920954, subversion/trunk/subversion/tests/cmdline/svneditor.sh.in) URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svneditor.sh?p2=subversion/trunk/subversion/tests/cmdline/svneditor.sh&p1=subversion/trunk/subversion/tests/cmdline/svneditor.sh.in&r1=1920954&r2=1920955&rev=1920955&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svneditor.sh.in (original) +++ subversion/trunk/subversion/tests/cmdline/svneditor.sh Thu Sep 26 13:22:09 2024 @@ -1,7 +1,7 @@ #!/bin/sh # -# svneditor.sh.in: a launcher of svneditor.py, used as $SVN_EDITOR -# for the Subversion test suite +# svneditor.sh: a launcher of svneditor.py, used as $SVN_EDITOR +# for the Subversion test suite # # Subversion is a tool for revision control. # See https://subversion.apache.org for more information. @@ -25,4 +25,5 @@ # under the License. ###################################################################### -exec @PYTHON@ "@abs_srcdir@"/svneditor.py "$@" +# SVN_TEST_PYTHON set by svntest/main.py +exec $SVN_TEST_PYTHON "$(dirname $0)/svneditor.py" "$@"
