changeset 14993:4234c348aa90 v8.1.0508

patch 8.1.0508: suspend test fails when run by root commit https://github.com/vim/vim/commit/0f62cf5b335968f7448af1a6f46e0104b7bc365e Author: Bram Moolenaar <Bram@vim.org> Date: Sat Nov 3 21:09:15 2018 +0100 patch 8.1.0508: suspend test fails when run by root Problem: Suspend test fails when run by root. Solution: Accept both '$' and '#' for the prompt. (James McCoy, closes https://github.com/vim/vim/issues/3590)
author Bram Moolenaar <Bram@vim.org>
date Sat, 03 Nov 2018 21:15:05 +0100
parents 3916597e1b30
children 2abb8dc8b4d2
files src/testdir/test_suspend.vim src/version.c
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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, '.'))})
--- 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,