diff options
author | Christian Brabandt <cb@256bit.org> | 2024-04-15 19:11:15 +0200 |
---|---|---|
committer | Christian Brabandt <cb@256bit.org> | 2024-04-15 19:11:15 +0200 |
commit | 29358d2a188bcab1c0057dd1628c4418a583278b (patch) | |
tree | 59c0f16753cbf93776715f6e872e6c4ea761ff83 | |
parent | 757f32141bb8ce797f71e7e22e59ba368e0f4952 (diff) |
patch 9.1.0333: tests: test_xdg fails on the appimage repov9.1.0333
Problem: tests: test_xdg fails on the appimage repo
Solution: compare only the last 30 right characters of $MYVIMRC
Signed-off-by: Christian Brabandt <cb@256bit.org>
-rw-r--r-- | src/testdir/test_xdg.vim | 10 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/testdir/test_xdg.vim b/src/testdir/test_xdg.vim index 4a43863436..b24205b5f3 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 1d8e1e3365..fc10c7c79b 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 333, +/**/ 332, /**/ 331, |