diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-09-28 08:16:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 08:16:55 +0200 |
| commit | c580ef68e873745ae02a577f11cbabb5e43271e4 (patch) | |
| tree | b41e35a6256ce6296009b736216e7cd06eec3ec2 | |
| parent | 542ed5f5d31647bfec6d3119f4e2993544530c35 (diff) | |
| parent | f1242c2a26f51c53c6f248666023a919f93d72fa (diff) | |
| download | rneovim-c580ef68e873745ae02a577f11cbabb5e43271e4.tar.gz rneovim-c580ef68e873745ae02a577f11cbabb5e43271e4.tar.bz2 rneovim-c580ef68e873745ae02a577f11cbabb5e43271e4.zip | |
Merge #7328 from jamessan/keep-testdir-make
Fix overzealous exclusions in vim-patch.sh
| -rwxr-xr-x | scripts/vim-patch.sh | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/Makefile | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 5ebb6a38b3..4f6bb40488 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -133,7 +133,7 @@ preprocess_patch() { # Remove *.proto, Make*, gui_*, some if_* local na_src='proto\|Make*\|gui_*\|if_lua\|if_mzsch\|if_olepp\|if_ole\|if_perl\|if_py\|if_ruby\|if_tcl\|if_xcmdsrv' - 2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/\S*\<\%('${na_src}'\)@norm! d/\v(^diff)|%$
' +w +q "$file" + 2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/\S*\<\%(testdir/\)\@<!\%('${na_src}'\)@norm! d/\v(^diff)|%$
' +w +q "$file" # Remove channel.txt, netbeans.txt, os_*.txt, term.txt, todo.txt, version*.txt, tags local na_doc='channel\.txt\|netbeans\.txt\|os_\w\+\.txt\|term\.txt\|todo\.txt\|version\d\.txt\|tags' diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 9133bfc0a2..38caa8815d 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -59,6 +59,7 @@ NEW_TESTS ?= \ test_matchadd_conceal.res \ test_matchadd_conceal_utf8.res \ test_mksession.res \ + test_mksession_utf8.res \ test_nested_function.res \ test_normal.res \ test_quickfix.res \ |