Hi, I am currently working on testing with CMake.
I've noticed that there are some test scripts that implement custom SVN_EDITOR. The files we currently have for this are: - svneditor.py: the editor itself. - svneditor.bat: launches svneditor.py on Windows. The path to the Python executable will be determined from the SVN_TEST_PYTHON environment variable. - svneditor.sh: launches svneditor.py on Unix. This file is configured from svneditor.sh.in, and the path to the Python executable will be inserted into the script in configure-time. The explained configuration has been added in r1887324 [1]. - svneditor.sh.in: Template for svneditor.sh. Note: these files are located in the subversion\tests\cmdline directory. I'd like to suggest removing the configuration of the svneditor.sh script, but put it into the repository and retrieve the path to the Python executable from the SVN_TEST_PYTHON environment variable (how it is on Windows). It will still ensure that we use the same Python as used for running tests. Attaching the patch as 'svn-svneditor-do-not-configure.patch.txt' Note: the source-tree should not be modified when configuring or building using CMake, so simply adding configuration of this script is complicated, because it should be configured into build dir. [1] https://svn.apache.org/viewvc?view=revision&revision=r1887324 What do you think? -- Timofei Zhakov
Index: configure.ac =================================================================== --- configure.ac (revision 1920765) +++ configure.ac (working copy) @@ -1764,7 +1764,6 @@ 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) Index: subversion/tests/cmdline/svneditor.sh =================================================================== --- subversion/tests/cmdline/svneditor.sh (revision 1920765) +++ subversion/tests/cmdline/svneditor.sh (working copy) @@ -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,4 @@ # under the License. ###################################################################### -exec @PYTHON@ "@abs_srcdir@"/svneditor.py "$@" +exec $SVN_TEST_PYTHON "$(dirname $0)/svneditor.py" "$@" Index: subversion/tests/cmdline/svneditor.sh.in =================================================================== --- subversion/tests/cmdline/svneditor.sh.in (revision 1920765) +++ subversion/tests/cmdline/svneditor.sh.in (nonexistent) @@ -1,28 +0,0 @@ -#!/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 https://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. -###################################################################### - -exec @PYTHON@ "@abs_srcdir@"/svneditor.py "$@" Property changes on: subversion/tests/cmdline/svneditor.sh.in ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property
