On Wed, Sep 25, 2024 at 6:22 PM Timofei Zhakov <t...@chemodax.net> wrote: > > On Wed, Sep 25, 2024 at 2:29 PM Jun Omae <jun6...@gmail.com> wrote: > > > > On 2024/09/22 23:34, Timofei Zhakov wrote: > > > 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? > > > > Looks good to me. Also, I confirmed unit tests pass on both configure > > and cmake with make generator. > > > > I'd suggest two things: > > > > - Add the following comment to svneditor.sh like svneditor.bat: > > > > # SVN_TEST_PYTHON set by svntest/main.py > > > > - Remove "svneditor.sh" from svn:ignore of subversion/tests/cmdline > > Thanks for reviewing! > > These suggestions look great to me. Attached a new patch as > 'svn-svneditor-do-not-configure-v2.patch.txt' and wrote the > logmessage. > > [[[ > 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 > ]]]
Committed in revision 1920955. Currently waiting for GitHub Actions to finish running (they have passed in my GitHub fork). Thanks for reviewing! -- Timofei Zhakov
