summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-10-12 17:52:42 +0200
committerBram Moolenaar <Bram@vim.org>2016-10-12 17:52:42 +0200
commit3e8474dd50f64c998bb665ce852f584a58dede6b (patch)
tree912cd7f7d24358c82ae052aa060742232b6a017b
parente8ef3a093453b73594e15462d4de50b011c8ba66 (diff)
patch 8.0.0032v8.0.0032
Problem: Tests may change the input file when something goes wrong. Solution: Avoid writing the input file.
-rw-r--r--src/testdir/test51.in2
-rw-r--r--src/testdir/test67.in2
-rw-r--r--src/testdir/test97.in2
-rw-r--r--src/testdir/test_tabpage.vim1
-rw-r--r--src/version.c2
5 files changed, 6 insertions, 3 deletions
diff --git a/src/testdir/test51.in b/src/testdir/test51.in
index b4f45d1f75..b66befb05f 100644
--- a/src/testdir/test51.in
+++ b/src/testdir/test51.in
@@ -24,7 +24,7 @@ STARTTEST
:hi Crash term='asdf
:redir END
:" filter ctermfg and ctermbg, the numbers depend on the terminal
-:e test.out
+:e! test.out
:%s/ctermfg=\d*/ctermfg=2/
:%s/ctermbg=\d*/ctermbg=3/
:" filter out possibly translated error message
diff --git a/src/testdir/test67.in b/src/testdir/test67.in
index 08b4e3701f..e40cbabd6f 100644
--- a/src/testdir/test67.in
+++ b/src/testdir/test67.in
@@ -24,7 +24,7 @@ STARTTEST
:call add(results, "#BufEnter#<buffer>: " . exists("#BufEnter#<buffer>"))
:edit testfile2.test
:call add(results, "#BufEnter#<buffer>: " . exists("#BufEnter#<buffer>"))
-:e test.out
+:e! test.out
:call append(0, results)
:$d
:w
diff --git a/src/testdir/test97.in b/src/testdir/test97.in
index d4ff6d9295..5a4cb1e17c 100644
--- a/src/testdir/test97.in
+++ b/src/testdir/test97.in
@@ -7,7 +7,7 @@ STARTTEST
:set shell=doesnotexist
:" consistent sorting of file names
:set nofileignorecase
-:e test.out
+:e! test.out
:$put =glob('Xxx\{')
:$put =glob('Xxx\$')
:w! Xxx{
diff --git a/src/testdir/test_tabpage.vim b/src/testdir/test_tabpage.vim
index 4bee7956d7..3f69fb9193 100644
--- a/src/testdir/test_tabpage.vim
+++ b/src/testdir/test_tabpage.vim
@@ -11,6 +11,7 @@ function Test_tabpage()
0tabnew
1tabnew
$tabnew
+ %del
tabdo call append(line('$'), tabpagenr())
tabclose! 2
tabrewind
diff --git a/src/version.c b/src/version.c
index 39662f63e9..6fee4abf73 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 32,
+/**/
31,
/**/
30,