patch 9.1.0333: tests: test_xdg fails on the appimage repo
Commit:
https://github.com/vim/vim/commit/29358d2a188bcab1c0057dd1628c4418a583278b
Author: Christian Brabandt <c...@256bit.org>
Date: Mon Apr 15 19:11:15 2024 +0200
patch 9.1.0333: tests: test_xdg fails on the appimage repo
Problem: tests: test_xdg fails on the appimage repo
Solution: compare only the last 30 right characters of $MYVIMRC
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/testdir/test_xdg.vim b/src/testdir/test_xdg.vim
index 4a4386343..b24205b5f 100644
--- a/src/testdir/test_xdg.vim
+++ b/src/testdir/test_xdg.vim
@@ -80,7 +80,7 @@ func Test_xdg_runtime_files()
let rows = 20
let buf = RunVimInTerminal('', #{rows: rows, no_clean: 1})
call TermWait(buf)
- call term_sendkeys(buf, ":echo \$MYVIMRC\<cr>")
+ call term_sendkeys(buf, ":echo \$MYVIMRC[-30:]\<cr>")
call WaitForAssert({-> assert_match('XfakeHOME/\.vimrc', term_getline(buf,
rows))})
call term_sendkeys(buf, ":call filter(g:, {idx, _ -> idx =~ '^rc'})\<cr>")
call TermWait(buf)
@@ -94,7 +94,7 @@ func Test_xdg_runtime_files()
let buf = RunVimInTerminal('', #{rows: rows, no_clean: 1})
call TermWait(buf)
- call term_sendkeys(buf, ":echo \$MYVIMRC\<cr>")
+ call term_sendkeys(buf, ":echo \$MYVIMRC[-30:]\<cr>")
call WaitForAssert({-> assert_match('XfakeHOME/\.vim/vimrc',
term_getline(buf, rows))})
call term_sendkeys(buf, ":call filter(g:, {idx, _ -> idx =~ '^rc'})\<cr>")
call TermWait(buf)
@@ -108,7 +108,7 @@ func Test_xdg_runtime_files()
let buf = RunVimInTerminal('', #{rows: rows, no_clean: 1})
call TermWait(buf)
- call term_sendkeys(buf, ":echo \$MYVIMRC\<cr>")
+ call term_sendkeys(buf, ":echo \$MYVIMRC[-30:]\<cr>")
call WaitForAssert({-> assert_match('XfakeHOME/\.config/vim/vimrc',
term_getline(buf, rows))})
call term_sendkeys(buf, ":call filter(g:, {idx, _ -> idx =~ '^rc'})\<cr>")
call TermWait(buf)
@@ -125,8 +125,8 @@ func Test_xdg_runtime_files()
call TermWait(buf)
call term_sendkeys(buf, ":redraw!\<cr>")
call TermWait(buf)
- call term_sendkeys(buf, ":echo \$MYVIMRC\<cr>")
- call WaitForAssert({-> assert_match('xdg/vim/vimrc', term_getline(buf,
rows))})
+ call term_sendkeys(buf, ":echo \$MYVIMRC[-30:]\<cr>")
+ call WaitForAssert({-> assert_match('XfakeHOME/xdg/vim/vimrc',
term_getline(buf, rows))})
call term_sendkeys(buf, ":call filter(g:, {idx, _ -> idx =~ '^rc'})\<cr>")
call TermWait(buf)
call term_sendkeys(buf, ":let g:\<cr>")
diff --git a/src/version.c b/src/version.c
index 1d8e1e336..fc10c7c79 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 333,
/**/
332,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1rwPv6-00CI2R-0Z%40256bit.org.
