[bug#50844] [PATCH] Update vim to v8.2.3455

[Efraim Flashner <efraim@flashner.co.il>]

[-- Attachment #1: Type: text/plain, Size: 2801 bytes --]

On Tue, Oct 05, 2021 at 12:25:34PM +0100, Steve George wrote:
> Hi Tobias/Efraim,
> 
> Apologies for the delay, this is my first attempt at a contribution and I've
> been learning/struggling with my set-ups repeatability.
> 
> The Test_shellxquote (from test_shell.vim) test fails for me consistently
> after patch 3061.
> 
> I can get the current version in Guix to build fine:
> 
>   guix environment guix --pure
>   ./pre-inst-env guix environment vim
> 
>   ./pre-inst-env guix build vim --no-substitutes --verbosity=3 --keep-failed
> 2>&1 | tee ../8.2.2689-vim-build.log
> 
> In 3061
> (https://github.com/vim/vim/commit/054794c20f6322bbd9482c4124041dc0a140c78e)
> the shell tests were changed. This build fails for me:
> 
> ./pre-inst-env guix build vim --no-substitutes --verbosity=3
> --with-git-url=vim=https://github.com/vim/vim --with-commit=vim=v8.2.3061
> --keep-failed 2>&1 | tee ../8.2.3061-git-vim-build.log
> 
> Failures:
>         From test_shell.vim:
>         Found errors in Test_shellxquote():
>         Caught exception in Test_shellxquote(): Vim(call):E484: Can't open
> file Xlog @ command line..script /tmp/guix-build-vim-8.2.3477.drv-0/source/src/testdir/runtest.vim[486]..function
> RunTheTest[44]..Test_shellxquote, line 13
> 
> In the tests log it says:
> 
> Cannot execute shell ./Xtestshell
> 
> The issue appears to be that if the Xtestshell file is there already then it
> fails.
> 
> I can build it fine manually:
> 
>   guix environment guix --pure
>   ./pre-inst-env guix environment vim --ad-hoc less
>   cd <source location>
>   source ./environment-variables
>   cd src/testdir
>   mv Xtestshell Xtestshell.bak
>   make
> 
> That's as far as I've got at this point.
> 
> Are either of you able to confirm that you can:
> 
> a. Build versions before 3061 (ie 3060)
> 
> b. That with 3061 if you move Xtestshell it builds
> 
> c. Suggest any paths from here?
> 
> 
> Thanks,
> 
> Steve
> 

./pre-inst-env guix build --no-grafts --no-substitutes vim --with-commit=vim=v8.2.3060
worked for me on the machines I was able to test it on.

(ins)efraim@3900XT ~$ cat /tmp/guix-build-vim-8.2.3061.drv-0/source/src/testdir/Xtestshell
#!/bin/sh
echo "Cmd: [$*]" > Xlog

After adding 'testdir/test_shell.vim' to the '/bin/sh' substitution in the
'patch-absolute-paths phase I was able to build 8.2.3061.

I'd go ahead and make that change in the substitution and if that fixes
the version you sent then either resend that patch with the change or
try bumping vim to a later version.

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]