diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-02-11 20:24:52 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-02-11 22:40:12 +0100 |
| commit | 43631675d82be89b81a8f644dab9509750ca0bf0 (patch) | |
| tree | 19742acfe62e4cb674bac50a55d75086f70b04bc | |
| parent | aaff91d925b1ae7a0a29b2572662612c972234d0 (diff) | |
| download | rneovim-43631675d82be89b81a8f644dab9509750ca0bf0.tar.gz rneovim-43631675d82be89b81a8f644dab9509750ca0bf0.tar.bz2 rneovim-43631675d82be89b81a8f644dab9509750ca0bf0.zip | |
vim-patch:8.0.1333: some tests are run twice
Problem: Some tests are run twice.
Solution: Invoked most utf8 tests only from test_alot_utf8. (Yegappan
Lakshmanan, closes vim/vim#2369)
https://github.com/vim/vim/commit/2c997d76034d5294c92305108357daef6feabd95
| -rw-r--r-- | src/nvim/testdir/Makefile | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/test_alot_utf8.vim | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/test_mksession_utf8.vim | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 30fdb06cc9..dddeadb080 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -71,16 +71,13 @@ NEW_TESTS ?= \ test_lambda.res \ test_langmap.res \ test_listlbr.res \ - test_listlbr_utf8.res \ test_let.res \ test_lineending.res \ test_makeencoding.res \ test_marks.res \ test_match.res \ test_matchadd_conceal.res \ - test_matchadd_conceal_utf8.res \ test_mksession.res \ - test_mksession_utf8.res \ test_nested_function.res \ test_normal.res \ test_number.res \ @@ -96,7 +93,6 @@ NEW_TESTS ?= \ test_spell.res \ test_stat.res \ test_startup.res \ - test_startup_utf8.res \ test_substitute.res \ test_syntax.res \ test_system.res \ diff --git a/src/nvim/testdir/test_alot_utf8.vim b/src/nvim/testdir/test_alot_utf8.vim index 13e227b6ea..648d806a94 100644 --- a/src/nvim/testdir/test_alot_utf8.vim +++ b/src/nvim/testdir/test_alot_utf8.vim @@ -7,8 +7,11 @@ source test_charsearch_utf8.vim source test_expr_utf8.vim +source test_listlbr_utf8.vim source test_matchadd_conceal_utf8.vim +source test_mksession_utf8.vim source test_regexp_utf8.vim source test_source_utf8.vim +source test_startup_utf8.vim source test_utf8.vim source test_utf8_comparisons.vim diff --git a/src/nvim/testdir/test_mksession_utf8.vim b/src/nvim/testdir/test_mksession_utf8.vim index c05a1d3b6d..8ffbba2a1c 100644 --- a/src/nvim/testdir/test_mksession_utf8.vim +++ b/src/nvim/testdir/test_mksession_utf8.vim @@ -99,6 +99,7 @@ func Test_mksession_utf8() call delete('test_mks.out') call delete(tmpfile) let &wrap = wrap_save + set sessionoptions& splitbelow& fileencoding& endfunc " vim: shiftwidth=2 sts=2 expandtab |