patch 8.2.1432: various inconsistencies in test files
Problem: Various inconsistencies in test files.
Solution: Add modelines where they were missing. Use Check commands instead
of silently skipping over tests. Adjust indents and comments.
(Ken Takata, closes #6695)
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 7aaeeb7..c2d9066 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -1,4 +1,5 @@
" Tests for various functions.
+
source shared.vim
source check.vim
source term_util.vim
@@ -297,9 +298,7 @@
endfunc
func Test_resolve_unix()
- if !has('unix')
- return
- endif
+ CheckUnix
" Xlink1 -> Xlink2
" Xlink2 -> Xlink3
@@ -349,9 +348,7 @@
endfunc
func Test_resolve_win32()
- if !has('win32')
- return
- endif
+ CheckMSWindows
" test for shortcut file
if executable('cscript')
@@ -1243,13 +1240,13 @@
call assert_equal(1, executable(catcmd))
call assert_equal('/' .. catcmd, catcmd->exepath())
bwipe
+ else
+ throw 'Skipped: does not work on this platform'
endif
endfunc
func Test_executable_longname()
- if !has('win32')
- return
- endif
+ CheckMSWindows
let fname = 'X' . repeat('あ', 200) . '.bat'
call writefile([], fname)
@@ -1418,13 +1415,12 @@
endfunc
func Test_balloon_show()
- if has('balloon_eval')
- " This won't do anything but must not crash either.
- call balloon_show('hi!')
- if !has('gui_running')
- call balloon_show(range(3))
- call balloon_show([])
- endif
+ CheckFeature balloon_eval
+ " This won't do anything but must not crash either.
+ call balloon_show('hi!')
+ if !has('gui_running')
+ call balloon_show(range(3))
+ call balloon_show([])
endif
endfunc
@@ -1654,9 +1650,7 @@
endfunc
func Test_libcall_libcallnr()
- if !has('libcall')
- return
- endif
+ CheckFeature libcall
if has('win32')
let libc = 'msvcrt.dll'