aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2019-09-18 22:38:27 +0200
committerDaniel Hahler <git@thequod.de>2019-09-18 22:38:37 +0200
commit10c050caf99df7324f84b4595e8fd1db7f7a2c10 (patch)
tree299ef9326f60ff4ffee21f521059b801116eebd2
parent865aaa031a06fca61d717621a26906cef42732d1 (diff)
downloadrneovim-10c050caf99df7324f84b4595e8fd1db7f7a2c10.tar.gz
rneovim-10c050caf99df7324f84b4595e8fd1db7f7a2c10.tar.bz2
rneovim-10c050caf99df7324f84b4595e8fd1db7f7a2c10.zip
vim-patch:8.1.0599: without the +eval feature the indent tests don't work
Problem: Without the +eval feature the indent tests don't work. Solution: Skip the body of the tests. https://github.com/vim/vim/commit/eeed665b0ecd917e88e3475c9615d52546aa124d
-rw-r--r--runtime/indent/testdir/cleantest.vim13
-rw-r--r--runtime/indent/testdir/runtest.vim6
2 files changed, 15 insertions, 4 deletions
diff --git a/runtime/indent/testdir/cleantest.vim b/runtime/indent/testdir/cleantest.vim
index 909cf812c4..69c0a1d4ba 100644
--- a/runtime/indent/testdir/cleantest.vim
+++ b/runtime/indent/testdir/cleantest.vim
@@ -1,6 +1,11 @@
-" Deletes all the test output files: *.fail and *.out
-for fname in glob('testdir/*.out', 1, 1) + glob('testdir/*.fail', 1, 1)
- call delete(fname)
-endfor
+" Only do this with the +eval feature
+if 1
+
+ " Deletes all the test output files: *.fail and *.out
+ for fname in glob('testdir/*.out', 1, 1) + glob('testdir/*.fail', 1, 1)
+ call delete(fname)
+ endfor
+
+endif
quit
diff --git a/runtime/indent/testdir/runtest.vim b/runtime/indent/testdir/runtest.vim
index 1cc0d3f716..96c31453af 100644
--- a/runtime/indent/testdir/runtest.vim
+++ b/runtime/indent/testdir/runtest.vim
@@ -2,6 +2,9 @@
"
" Current directory must be runtime/indent.
+" Only do this with the +eval feature
+if 1
+
set nocp
filetype indent on
set nowrapscan
@@ -116,4 +119,7 @@ for fname in glob('testdir/*.in', 1, 1)
endif
endfor
+" Matching "if 1" at the start.
+endif
+
qall!