diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-03-25 21:24:12 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-03-25 21:24:12 +0200 |
| commit | 086eb876951aa0b0bee3de4ed0569bf4b70c6f31 (patch) | |
| tree | 43dfc57119efe6d6811ddbc38c304789c3b36fc2 | |
| parent | cf67a509e93167f14c892301e13de14636cedc61 (diff) | |
patch 8.0.1645: test for terminal response to escape sequence may failv8.0.1645
Problem: Test for terminal response to escape sequence fails for some
people. (toothpik)
Solution: Run "cat" and let it echo the characters.
| -rw-r--r-- | src/testdir/test_terminal.vim | 21 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 12 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index f981fcc950..ff50568321 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -833,25 +833,22 @@ func Test_terminal_response_to_control_sequence() endif let buf = Run_shell_in_terminal({}) - call WaitFor({-> term_getline(buf, 1) != ""}) + call WaitFor({-> term_getline(buf, 1) != ''}) - call writefile(["\x1b[6n"], 'Xescape') - call term_sendkeys(buf, "cat Xescape\<cr>") + call term_sendkeys(buf, "cat\<CR>") + call WaitFor({-> term_getline(buf, 1) =~ 'cat'}) - " wait for the response of control sequence from libvterm (and send it to tty) - sleep 200m - call term_wait(buf) + " Request the cursor position. + call term_sendkeys(buf, "\x1b[6n\<CR>") " Wait for output from tty to display, below an empty line. - " It should show \e3;1R, but only 1R may show up - call assert_match('\<\d\+R', term_getline(buf, 3)) + call WaitFor({-> term_getline(buf, 4) =~ '3;1R'}) - call term_sendkeys(buf, "\<c-c>") - call term_wait(buf) - call Stop_shell_in_terminal(buf) + " End "cat" gently. + call term_sendkeys(buf, "\<CR>\<C-D>") + call Stop_shell_in_terminal(buf) exe buf . 'bwipe' - call delete('Xescape') unlet g:job endfunc diff --git a/src/version.c b/src/version.c index 1a8c10ea47..2cc99778d4 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1645, +/**/ 1644, /**/ 1643, |