patch 8.2.0352: FreeBSD: test for sourcing utf-8 is skipped

Problem:    FreeBSD: test for sourcing utf-8 is skipped.
Solution:   Run the matchadd_conceal test separately to avoid that setting
            'term' to "ansi" causes problems for other tests. (Ozaki Kiichi,
            closes #5721)

diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index 3a4979bf33c84c0d63de097cf3c3bccbd2da62cd..fab86568a68002f9dd51897a16075ea4ffd7f094 100644 (file)
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -398,6 +398,7 @@ NEW_TESTS_RES = \
        test_marks.res \
        test_match.res \
        test_matchadd_conceal.res \
+       test_matchadd_conceal_utf8.res \
        test_memory_usage.res \
        test_messages.res \
        test_method.res \

diff --git a/src/testdir/test_alot_utf8.vim b/src/testdir/test_alot_utf8.vim
index be0bd014132a3dd3c3ef63a9a8a1560c81694114..11de055809a127145c005776bf098bd20f9a1118 100644 (file)
--- a/src/testdir/test_alot_utf8.vim
+++ b/src/testdir/test_alot_utf8.vim
@@ -7,7 +7,6 @@
 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

diff --git a/src/testdir/test_source_utf8.vim b/src/testdir/test_source_utf8.vim
index 99cb09c50e338cc74f88d9e18cd1f61e4d01873e..66fabe04420f59c222c55ce1526226f2166ac0e1 100644 (file)
--- a/src/testdir/test_source_utf8.vim
+++ b/src/testdir/test_source_utf8.vim
@@ -3,8 +3,6 @@ source check.vim
 
 func Test_source_utf8()
   " check that sourcing a script with 0x80 as second byte works
-  " does not work correctly on BSD
-  CheckNotBSD
   new
   call setline(1, [':%s/àx/--à1234--/g', ':%s/Àx/--À1234--/g'])
   write! Xscript
@@ -34,25 +32,24 @@ endfunc
 
 " Test for sourcing a file with CTRL-V's at the end of the line
 func Test_source_ctrl_v()
-    CheckNotBSD
-    call writefile(['map __1 afirst',
-               \ 'map __2 asecond',
-               \ 'map __3 athird',
-               \ 'map __4 afourth',
-               \ 'map __5 afifth',
-               \ "map __1 asd\<C-V>",
-               \ "map __2 asd\<C-V>\<C-V>",
-               \ "map __3 asd\<C-V>\<C-V>",
-               \ "map __4 asd\<C-V>\<C-V>\<C-V>",
-               \ "map __5 asd\<C-V>\<C-V>\<C-V>",
-               \ ], 'Xtestfile')
+  call writefile(['map __1 afirst',
+        \ 'map __2 asecond',
+        \ 'map __3 athird',
+        \ 'map __4 afourth',
+        \ 'map __5 afifth',
+        \ "map __1 asd\<C-V>",
+        \ "map __2 asd\<C-V>\<C-V>",
+        \ "map __3 asd\<C-V>\<C-V>",
+        \ "map __4 asd\<C-V>\<C-V>\<C-V>",
+        \ "map __5 asd\<C-V>\<C-V>\<C-V>",
+        \ ], 'Xtestfile')
   source Xtestfile
   enew!
   exe "normal __1\<Esc>\<Esc>__2\<Esc>__3\<Esc>\<Esc>__4\<Esc>__5\<Esc>"
   exe "%s/\<C-J>/0/g"
   call assert_equal(['sd',
-             \ "map __2 asd\<Esc>secondsd\<Esc>sd0map __5 asd0fifth"],
-             \ getline(1, 2))
+        \ "map __2 asd\<Esc>secondsd\<Esc>sd0map __5 asd0fifth"],
+        \ getline(1, 2))
 
   enew!
   call delete('Xtestfile')

diff --git a/src/version.c b/src/version.c
index b9fc30ac2f378cc5aa5c9f1496e3c3aea5d603a1..19dc616c5d64708587e534394c9c3e923c0ea49e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    352,
 /**/
     351,
 /**/