diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-06-03 15:26:36 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-06-03 15:26:36 +0200 |
| commit | 1580f755c91d12a3e63d60eec8733f8b79debc31 (patch) | |
| tree | 820074636da7d0fd1808a5d993c9dd0a62b3bfbe | |
| parent | 1149382d21402474c771862d082a541e23beb108 (diff) | |
patch 8.1.0029: terminal test fails on MS-Windows when "wc" existsv8.1.0029
Problem: Terminal test fails on MS-Windows when "wc" exists.
Solution: Skip test with redirection on MS-Windows.
| -rw-r--r-- | src/testdir/test_terminal.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 4cd77572eb..41a0a45003 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -580,6 +580,10 @@ func Test_terminal_write_stdin() if !executable('wc') throw 'skipped: wc command not available' endif + if has('win32') + " TODO: enable once writing to stdin works on MS-Windows + return + endif new call setline(1, ['one', 'two', 'three']) %term wc diff --git a/src/version.c b/src/version.c index 4d9696bc58..70fd603354 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 29, +/**/ 28, /**/ 27, |