Mercurial > vim
changeset 19209:b780229f5792 v8.2.0163
patch 8.2.0163: test hangs on MS-Windows console
Commit: https://github.com/vim/vim/commit/272ca95fc3d21ae1e2626a7aec38a6990e88ad6b
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jan 28 20:49:11 2020 +0100
patch 8.2.0163: test hangs on MS-Windows console
Problem: Test hangs on MS-Windows console.
Solution: use feedkeys() instead of test_feedinput(). (Ken Takata)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 28 Jan 2020 21:00:04 +0100 |
| parents | f3dd340940a6 |
| children | 0e66a46b365c |
| files | src/testdir/test_functions.vim src/testing.c src/version.c |
| diffstat | 3 files changed, 15 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -1844,12 +1844,10 @@ func Test_range() call assert_equal(1, index(range(1, 5), 2)) " inputlist() - call test_feedinput("1\<CR>") - call assert_equal(1, inputlist(range(10))) - call test_feedinput("1\<CR>") - call assert_equal(1, inputlist(range(3, 10))) - - call assert_equal('[0,1,2,3]', json_encode(range(4))) + call feedkeys(":let result = inputlist(range(10))\<CR>1\<CR>", 'x') + call assert_equal(1, result) + call feedkeys(":let result = inputlist(range(3, 10))\<CR>1\<CR>", 'x') + call assert_equal(1, result) " insert() call assert_equal([42, 1, 2, 3, 4, 5], insert(range(1, 5), 42)) @@ -1862,6 +1860,9 @@ func Test_range() " join() call assert_equal('0 1 2 3 4', join(range(5))) + " json_encode() + call assert_equal('[0,1,2,3]', json_encode(range(4))) + " len() call assert_equal(0, len(range(0))) call assert_equal(2, len(range(2)))
--- a/src/testing.c +++ b/src/testing.c @@ -640,6 +640,12 @@ f_test_feedinput(typval_T *argvars, typv #ifdef USE_INPUT_BUF char_u *val = tv_get_string_chk(&argvars[0]); +# ifdef VIMDLL + // this doesn't work in the console + if (!gui.in_use) + return; +# endif + if (val != NULL) { trash_input_buf();