]> git.ipfire.org Git - thirdparty/vim.git/commitdiff
patch 9.1.0333: tests: test_xdg fails on the appimage repo v9.1.0333
authorChristian Brabandt <cb@256bit.org>
Mon, 15 Apr 2024 17:11:15 +0000 (19:11 +0200)
committerChristian Brabandt <cb@256bit.org>
Mon, 15 Apr 2024 17:11:15 +0000 (19:11 +0200)
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>
src/testdir/test_xdg.vim
src/version.c

index 4a43863436379b9708ac37017c54fd2b6d9428ae..b24205b5f3feaa056189c7bc4d595d6bdb9a80af 100644 (file)
@@ -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>")
index 1d8e1e33653aeb625a3e079382ec4b0ea4cbbe49..fc10c7c79b25cd1d53a22e40d9b0b37b1d1713ba 100644 (file)
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    333,
 /**/
     332,
 /**/