diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-22 18:14:58 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-22 18:14:58 +0200 |
| commit | 2690b5aed8b6b6070430b05dcae296cd9479c942 (patch) | |
| tree | a46bd609532e4be16d3def7e6ff1d483c30fa31d | |
| parent | bc6fcbe4ce52bc48c3d77b24086acc61ed3333bc (diff) | |
patch 8.2.1267: MS-Windows: tests may fail due to $PROMPT valuev8.2.1267
Problem: MS-Windows: tests may fail due to $PROMPT value.
Solution: Set $PROMPT for testing. (Taro Muraoka, closes #6510)
| -rw-r--r-- | src/testdir/runtest.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 60805f1318..3cf2a506c9 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -117,6 +117,11 @@ set shellslash let s:srcdir = expand('%:p:h:h') +if has('win32') + " avoid prompt that is long or contains a line break + let $PROMPT = '$P$G' +endif + " Prepare for calling test_garbagecollect_now(). let v:testing = 1 diff --git a/src/version.c b/src/version.c index 3847ec9b4a..e4e70243b6 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1267, +/**/ 1266, /**/ 1265, |