patch 9.0.1854: test_crash1() fails on CI
Commit:
https://github.com/vim/vim/commit/db510ca8052884fd260f425025bacf44f6c92fa9
Author: Christian Brabandt <c...@256bit.org>
Date: Sun Sep 3 09:23:12 2023 +0200
patch 9.0.1854: test_crash1() fails on CI
Problem: test_crash1() fails on CI
Solution: don't run Screendump test, verify that it doesn't crash
by running it through a shell command line, testing
the exit value and concatenating success cmd using '&&'
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/testdir/test_crash.vim b/src/testdir/test_crash.vim
index 445fe8d5a..eb3c0a37f 100644
--- a/src/testdir/test_crash.vim
+++ b/src/testdir/test_crash.vim
@@ -6,20 +6,40 @@ CheckScreendump
func Test_crash1()
" The following used to crash Vim
- let opts = #{wait_for_ruler: 0, rows: 20}
- let args = ' -u NONE -i NONE -n -e -s -S '
- let buf = RunVimInTerminal(args .. ' crash/poc_huaf1', opts)
- call VerifyScreenDump(buf, 'Test_crash_01', {})
- exe buf .. "bw!"
+ " let opts = #{wait_for_ruler: 0, rows: 20, cmd: 'sh'}
+ let opts = #{cmd: 'sh'}
+ let args = 'bash'
+ let vim = GetVimProg()
- let buf = RunVimInTerminal(args .. ' crash/poc_huaf2', opts)
- call VerifyScreenDump(buf, 'Test_crash_01', {})
- exe buf .. "bw!"
+ let buf = RunVimInTerminal(args, opts)
- let buf = RunVimInTerminal(args .. ' crash/poc_huaf3', opts)
- call VerifyScreenDump(buf, 'Test_crash_01', {})
+ let file = 'crash/poc_huaf1'
+ let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
+ let args = printf(cmn_args, vim, file)
+ call term_sendkeys(buf, args ..
+ \ ' && echo "crash 1: [OK]" >> X_crash1_result.txt' .. "\<cr>")
+
+ let file = 'crash/poc_huaf2'
+ let args = printf(cmn_args, vim, file)
+ call term_sendkeys(buf, args ..
+ \ ' && echo "crash 2: [OK]" >> X_crash1_result.txt' .. "\<cr>")
+
+ let file = 'crash/poc_huaf3'
+ let args = printf(cmn_args, vim, file)
+ call term_sendkeys(buf, args ..
+ \ ' && echo "crash 3: [OK]" >> X_crash1_result.txt' .. "\<cr>")
+
+ call TermWait(buf, 50)
+
+ " clean up
exe buf .. "bw!"
+ sp X_crash1_result.txt
+ call assert_equal(['crash 1: [OK]', 'crash 2: [OK]', 'crash 3: [OK]'],
+ \ getline(1, '$'))
+ bw!
+
+ call delete('X_crash1_result.txt')
endfunc
func Test_crash2()
diff --git a/src/version.c b/src/version.c
index fe1495ab6..c1f72ff9d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1854,
/**/
1853,
/**/
--
--
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/E1qchn7-00DCyv-BV%40256bit.org.
