diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index bce7e10dee..52c35aaaad 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1487,8 +1487,9 @@ func Test_terminal_out_err() let outfile = 'Xtermstdout' let buf = term_start(['./Xechoerrout.sh'], {'out_io': 'file', 'out_name': outfile}) - call WaitForAssert({-> assert_inrange(1, 2, len(readfile(outfile)))}) - call assert_equal("this is standard out", readfile(outfile)[0]) + + call WaitFor({-> !empty(readfile(outfile)) && !empty(term_getline(buf, 1))}) + call assert_equal(['this is standard out'], readfile(outfile)) call assert_equal('this is standard error', term_getline(buf, 1)) call WaitForAssert({-> assert_equal('dead', job_status(term_getjob(buf)))}) diff --git a/src/version.c b/src/version.c index 72a8238581..9a1fbc6544 100644 --- a/src/version.c +++ b/src/version.c @@ -761,6 +761,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 88, /**/ 87, /**/