diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-01-28 20:49:11 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-01-28 20:49:11 +0100 |
| commit | 272ca95fc3d21ae1e2626a7aec38a6990e88ad6b (patch) | |
| tree | 54526fdfb9b2fbcc545e72868b510d06431fd063 | |
| parent | 7d8ea0b24191d64155fcf9e8d2d2eefff91ae549 (diff) | |
| download | vim-git-272ca95fc3d21ae1e2626a7aec38a6990e88ad6b.tar.gz | |
patch 8.2.0163: test hangs on MS-Windows consolev8.2.0163
Problem: Test hangs on MS-Windows console.
Solution: use feedkeys() instead of test_feedinput(). (Ken Takata)
| -rw-r--r-- | src/testdir/test_functions.vim | 13 | ||||
| -rw-r--r-- | src/testing.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 15 insertions, 6 deletions
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim index c6088f33a..595a96358 100644 --- 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))) diff --git a/src/testing.c b/src/testing.c index 3ab9dcdc9..5dacf073b 100644 --- a/src/testing.c +++ b/src/testing.c @@ -640,6 +640,12 @@ f_test_feedinput(typval_T *argvars, typval_T *rettv UNUSED) #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(); diff --git a/src/version.c b/src/version.c index 7c5af6371..46a71dbc3 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 163, +/**/ 162, /**/ 161, |