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 #2369)
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index 6e33564..d9ff056 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -79,7 +79,6 @@
test_cdo.res \
test_channel.res \
test_charsearch.res \
- test_charsearch_utf8.res \
test_cindent.res \
test_clientserver.res \
test_close_count.res \
@@ -98,7 +97,6 @@
test_exec_while_if.res \
test_exists.res \
test_exists_autocmd.res \
- test_expr_utf8.res \
test_farsi.res \
test_file_size.res \
test_find_complete.res \
@@ -128,16 +126,13 @@
test_listchars.res \
test_listdict.res \
test_listlbr.res \
- test_listlbr_utf8.res \
test_lua.res \
test_makeencoding.res \
test_man.res \
test_maparg.res \
test_marks.res \
test_matchadd_conceal.res \
- test_matchadd_conceal_utf8.res \
test_mksession.res \
- test_mksession_utf8.res \
test_nested_function.res \
test_netbeans.res \
test_normal.res \
@@ -156,8 +151,6 @@
test_quickfix.res \
test_quotestar.res \
test_regex_char_classes.res \
- test_regexp_latin.res \
- test_regexp_utf8.res \
test_registers.res \
test_retab.res \
test_ruby.res \
@@ -165,10 +158,8 @@
test_search.res \
test_signs.res \
test_smartindent.res \
- test_source_utf8.res \
test_spell.res \
test_startup.res \
- test_startup_utf8.res \
test_stat.res \
test_substitute.res \
test_swap.res \
@@ -183,8 +174,6 @@
test_undo.res \
test_user_func.res \
test_usercommands.res \
- test_utf8.res \
- test_utf8_comparisons.res \
test_viminfo.res \
test_vimscript.res \
test_visual.res \
diff --git a/src/testdir/test_alot_utf8.vim b/src/testdir/test_alot_utf8.vim
index 13e227b..648d806 100644
--- a/src/testdir/test_alot_utf8.vim
+++ b/src/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/testdir/test_mksession_utf8.vim b/src/testdir/test_mksession_utf8.vim
index c05a1d3..8ffbba2 100644
--- a/src/testdir/test_mksession_utf8.vim
+++ b/src/testdir/test_mksession_utf8.vim
@@ -99,6 +99,7 @@
call delete('test_mks.out')
call delete(tmpfile)
let &wrap = wrap_save
+ set sessionoptions& splitbelow& fileencoding&
endfunc
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 5824ecf..dc29e3d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1333,
+/**/
1332,
/**/
1331,