diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-03-17 12:27:23 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-03-17 12:27:23 +0100 |
| commit | f8c52e8d08de3fdf48db877d7d53d2d68c6ceb7b (patch) | |
| tree | ff53ccb4df5f66c1cec656f191cf0e665784358d /src/testdir/test_startup.vim | |
| parent | 1e448465e1281eeb379f75fe848cbb47fe1be1d9 (diff) | |
patch 8.2.2611: conditions for startup tests are not exactly rightv8.2.2611
Problem: Conditions for startup tests are not exactly right.
Solution: Check for type of GUI instead of MS-Windows. (Ozaki Kiichi,
closes #7976)
Diffstat (limited to 'src/testdir/test_startup.vim')
| -rw-r--r-- | src/testdir/test_startup.vim | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim index 169c21350e..17ac94d695 100644 --- a/src/testdir/test_startup.vim +++ b/src/testdir/test_startup.vim @@ -109,9 +109,8 @@ func Test_pack_in_rtp_when_plugins_run() endfunc func Test_help_arg() - if !has('unix') && has('gui_running') - throw 'Skipped: does not work with gvim on MS-Windows' - endif + " This does not work with a GUI-only binary, such as on MS-Windows. + CheckAnyOf Unix NotGui if RunVim([], [], '--help >Xtestout') let lines = readfile('Xtestout') @@ -426,7 +425,7 @@ endfunction " Test the -reverse and +reverse arguments (for GUI only). func Test_reverse() CheckCanRunGui - CheckNotMSWindows + CheckAnyOf Feature:gui_gtk Feature:gui_motif Feature:gui_athena let after =<< trim [CODE] call writefile([&background], "Xtest_reverse") @@ -447,7 +446,7 @@ endfunc " Test the -background and -foreground arguments (for GUI only). func Test_background_foreground() CheckCanRunGui - CheckNotMSWindows + CheckAnyOf Feature:gui_gtk Feature:gui_motif Feature:gui_athena " Is there a better way to check the effect of -background & -foreground " other than merely looking at &background (dark or light)? @@ -496,7 +495,7 @@ endfunc " Test the -geometry argument (for GUI only). func Test_geometry() CheckCanRunGui - CheckNotMSWindows + CheckAnyOf Feature:gui_gtk Feature:gui_motif Feature:gui_athena if has('gui_motif') || has('gui_athena') " FIXME: With GUI Athena or Motif, the value of getwinposx(), @@ -528,7 +527,7 @@ endfunc " Test the -iconic argument (for GUI only). func Test_iconic() CheckCanRunGui - CheckNotMSWindows + CheckAnyOf Feature:gui_gtk Feature:gui_motif Feature:gui_athena call RunVim([], [], '-f -g -iconic -cq') |