patch 8.2.2570: tests fail when run as root

Problem:    Tests fail when run as root.
Solution:   Add a comment mentioning the expected failure. (issue #7919)

diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim
index 6f083d95bd6934dacea6c543972b9e4ee8087c6d..0b44c7df3e55ec68830f1bdfdf70f26898641dfb 100644 (file)
--- a/src/testdir/test_edit.vim
+++ b/src/testdir/test_edit.vim
@@ -1704,6 +1704,7 @@ func Test_edit_charconvert()
 endfunc
 
 " Test for editing a file without read permission
+" NOTE: if you run tests as root this will fail.  Don't run tests as root!
 func Test_edit_file_no_read_perm()
   CheckUnix
   call writefile(['one', 'two'], 'Xfile')

diff --git a/src/testdir/test_excmd.vim b/src/testdir/test_excmd.vim
index f27b38562fb1054a81e8c4493a4253ac919747f2..0170a9f3b3964ab650ef8e42916c6e1a94bf9c2c 100644 (file)
--- a/src/testdir/test_excmd.vim
+++ b/src/testdir/test_excmd.vim
@@ -333,6 +333,7 @@ func Test_winsize_cmd()
 endfunc
 
 " Test for the :redir command
+" NOTE: if you run tests as root this will fail.  Don't run tests as root!
 func Test_redir_cmd()
   call assert_fails('redir @@', 'E475:')
   call assert_fails('redir abc', 'E475:')

diff --git a/src/testdir/test_help.vim b/src/testdir/test_help.vim
index 219689bde56bb4e836f86c3a1b3410ad66cc6e3e..966616c973a3b9cd130d21313c67d52e5870b3fa 100644 (file)
--- a/src/testdir/test_help.vim
+++ b/src/testdir/test_help.vim
@@ -74,6 +74,7 @@ func Test_help_completion()
 endfunc
 
 " Test for the :helptags command
+" NOTE: if you run tests as root this will fail.  Don't run tests as root!
 func Test_helptag_cmd()
   call mkdir('Xdir/a/doc', 'p')
 

diff --git a/src/testdir/test_writefile.vim b/src/testdir/test_writefile.vim
index 07beb64e64edd070a288da12d2e369f907882fde..e7a309a08843416018961598b06b562b3eec0f14 100644 (file)
--- a/src/testdir/test_writefile.vim
+++ b/src/testdir/test_writefile.vim
@@ -406,6 +406,7 @@ func Test_patchmode()
 endfunc
 
 " Test for writing to a file in a readonly directory
+" NOTE: if you run tests as root this will fail.  Don't run tests as root!
 func Test_write_readonly_dir()
   " On MS-Windows, modifying files in a read-only directory is allowed.
   CheckUnix

diff --git a/src/version.c b/src/version.c
index ffedb4fdf6feafebc61f1a129ff63f015a4e27fa..add4c38daca8735757282034def6c09c6fd8b17f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2570,
 /**/
     2569,
 /**/