Skip to content

Commit 29358d2

Browse files
committed
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 <[email protected]>
1 parent 757f321 commit 29358d2

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

src/testdir/test_xdg.vim

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func Test_xdg_runtime_files()
8080
let rows = 20
8181
let buf = RunVimInTerminal('', #{rows: rows, no_clean: 1})
8282
call TermWait(buf)
83-
call term_sendkeys(buf, ":echo \$MYVIMRC\<cr>")
83+
call term_sendkeys(buf, ":echo \$MYVIMRC[-30:]\<cr>")
8484
call WaitForAssert({-> assert_match('XfakeHOME/\.vimrc', term_getline(buf, rows))})
8585
call term_sendkeys(buf, ":call filter(g:, {idx, _ -> idx =~ '^rc'})\<cr>")
8686
call TermWait(buf)
@@ -94,7 +94,7 @@ func Test_xdg_runtime_files()
9494

9595
let buf = RunVimInTerminal('', #{rows: rows, no_clean: 1})
9696
call TermWait(buf)
97-
call term_sendkeys(buf, ":echo \$MYVIMRC\<cr>")
97+
call term_sendkeys(buf, ":echo \$MYVIMRC[-30:]\<cr>")
9898
call WaitForAssert({-> assert_match('XfakeHOME/\.vim/vimrc', term_getline(buf, rows))})
9999
call term_sendkeys(buf, ":call filter(g:, {idx, _ -> idx =~ '^rc'})\<cr>")
100100
call TermWait(buf)
@@ -108,7 +108,7 @@ func Test_xdg_runtime_files()
108108

109109
let buf = RunVimInTerminal('', #{rows: rows, no_clean: 1})
110110
call TermWait(buf)
111-
call term_sendkeys(buf, ":echo \$MYVIMRC\<cr>")
111+
call term_sendkeys(buf, ":echo \$MYVIMRC[-30:]\<cr>")
112112
call WaitForAssert({-> assert_match('XfakeHOME/\.config/vim/vimrc', term_getline(buf, rows))})
113113
call term_sendkeys(buf, ":call filter(g:, {idx, _ -> idx =~ '^rc'})\<cr>")
114114
call TermWait(buf)
@@ -125,8 +125,8 @@ func Test_xdg_runtime_files()
125125
call TermWait(buf)
126126
call term_sendkeys(buf, ":redraw!\<cr>")
127127
call TermWait(buf)
128-
call term_sendkeys(buf, ":echo \$MYVIMRC\<cr>")
129-
call WaitForAssert({-> assert_match('xdg/vim/vimrc', term_getline(buf, rows))})
128+
call term_sendkeys(buf, ":echo \$MYVIMRC[-30:]\<cr>")
129+
call WaitForAssert({-> assert_match('XfakeHOME/xdg/vim/vimrc', term_getline(buf, rows))})
130130
call term_sendkeys(buf, ":call filter(g:, {idx, _ -> idx =~ '^rc'})\<cr>")
131131
call TermWait(buf)
132132
call term_sendkeys(buf, ":let g:\<cr>")

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
333,
707709
/**/
708710
332,
709711
/**/

0 commit comments

Comments
 (0)