diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-11-03 21:09:15 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-11-03 21:09:15 +0100 |
| commit | 0f62cf5b335968f7448af1a6f46e0104b7bc365e (patch) | |
| tree | 1c3b53f6c991f1839823458787b76339b7f27cdb | |
| parent | da1c11c6411182e9a4bd4374e3fb8851fef77113 (diff) | |
patch 8.1.0508: suspend test fails when run by rootv8.1.0508
Problem: Suspend test fails when run by root.
Solution: Accept both '$' and '#' for the prompt. (James McCoy, closes #3590)
| -rw-r--r-- | src/testdir/test_suspend.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/test_suspend.vim b/src/testdir/test_suspend.vim index 462173e8cc..a9964b0400 100644 --- a/src/testdir/test_suspend.vim +++ b/src/testdir/test_suspend.vim @@ -9,7 +9,7 @@ func Test_suspend() let buf = term_start('/bin/sh') " Wait for shell prompt. - call WaitForAssert({-> assert_match('$ $', term_getline(buf, '.'))}) + call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))}) call term_sendkeys(buf, v:progpath \ . " --clean -X" @@ -26,7 +26,7 @@ func Test_suspend() \ "\<C-Z>"] " Suspend and wait for shell prompt. call term_sendkeys(buf, suspend_cmd) - call WaitForAssert({-> assert_match('$ $', term_getline(buf, '.'))}) + call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))}) " Without 'autowrite', buffer should not be written. call assert_equal(0, filereadable('Xfoo')) @@ -40,7 +40,7 @@ func Test_suspend() call assert_equal(0, filereadable('Xfoo')) call term_sendkeys(buf, ":suspend\<CR>") " Wait for shell prompt. - call WaitForAssert({-> assert_match('$ $', term_getline(buf, '.'))}) + call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))}) call assert_equal(['foo'], readfile('Xfoo')) call term_sendkeys(buf, "fg\<CR>") call WaitForAssert({-> assert_equal(' 1 foo', term_getline(buf, '.'))}) diff --git a/src/version.c b/src/version.c index 28f39d4b93..1e66b3ed78 100644 --- a/src/version.c +++ b/src/version.c @@ -793,6 +793,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 508, +/**/ 507, /**/ 506, |