diff options
| -rw-r--r-- | src/Makefile | 3 | ||||
| -rw-r--r-- | src/testdir/Make_all.mak | 3 | ||||
| -rw-r--r-- | src/testdir/Make_vms.mms | 4 | ||||
| -rw-r--r-- | src/testdir/test16.in | 16 | ||||
| -rw-r--r-- | src/testdir/test16.ok | 2 | ||||
| -rw-r--r-- | src/testdir/test_gui.vim | 28 | ||||
| -rw-r--r-- | src/version.c | 2 |
7 files changed, 36 insertions, 22 deletions
diff --git a/src/Makefile b/src/Makefile index 6d49e9046..273fc9ea9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2039,7 +2039,7 @@ test1 \ test_wordcount \ test_writefile \ test2 test3 test4 test5 test6 test7 test8 test9 \ - test11 test12 test13 test14 test15 test16 test17 test18 test19 \ + test11 test12 test13 test14 test15 test17 test18 test19 \ test20 test21 test22 test23 test24 test25 test26 test27 test28 test29 \ test30 test31 test32 test33 test34 test36 test37 test38 test39 \ test40 test41 test42 test43 test44 test45 test46 test48 test49 \ @@ -2080,6 +2080,7 @@ test_arglist \ test_glob2regpat \ test_gn \ test_goto \ + test_gui \ test_hardcopy \ test_help_tagjump \ test_history \ diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak index 2965b708d..9493ccb40 100644 --- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -154,7 +154,7 @@ SCRIPTS_WIN32 = test50.out # Tests for the GUI. -SCRIPTS_GUI = test16.out +SCRIPTS_GUI = # Tests using runtest.vim.vim. @@ -171,6 +171,7 @@ NEW_TESTS = test_arglist.res \ test_digraph.res \ test_farsi.res \ test_gn.res \ + test_gui.res \ test_hardcopy.res \ test_history.res \ test_increment.res \ diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms index ca4fceebd..5ce32aaa1 100644 --- a/src/testdir/Make_vms.mms +++ b/src/testdir/Make_vms.mms @@ -4,7 +4,7 @@ # Authors: Zoltan Arpadffy, <arpadffy@polarhome.com> # Sandor Kopanyi, <sandor.kopanyi@mailbox.hu> # -# Last change: 2016 Feb 25 +# Last change: 2016 Aug 04 # # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64. # Edit the lines in the Configuration section below to select. @@ -104,7 +104,7 @@ SCRIPT = $(SCRIPTS_ALL) $(SCRIPTS_MORE3) # On ODS-2 tests fail. .IFDEF WANT_GUI -SCRIPT_GUI = test16.out +SCRIPT_GUI = GUI_OPTION = -g .ENDIF diff --git a/src/testdir/test16.in b/src/testdir/test16.in deleted file mode 100644 index 760ac675c..000000000 --- a/src/testdir/test16.in +++ /dev/null @@ -1,16 +0,0 @@ -Tests for resetting "secure" flag after GUI has started. -For KDE set a font, empty 'guifont' may cause a hang. - -STARTTEST -:so small.vim -:if $DISPLAY == "" | e! test.ok | wq! test.out | endif -:set exrc secure -:if has("gui_kde") -: set guifont=Courier\ 10\ Pitch/8/-1/5/50/0/0/0/0/0 -:endif -:gui -f -:.,$w! test.out -:qa! -ENDTEST - - just some text diff --git a/src/testdir/test16.ok b/src/testdir/test16.ok deleted file mode 100644 index 25e2eea5c..000000000 --- a/src/testdir/test16.ok +++ /dev/null @@ -1,2 +0,0 @@ - - just some text diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim new file mode 100644 index 000000000..cd698e37a --- /dev/null +++ b/src/testdir/test_gui.vim @@ -0,0 +1,28 @@ +" Tests specifically for the GUI + +if !has('gui') || ($DISPLAY == "" && !has('gui_running')) + finish +endif + +" For KDE set a font, empty 'guifont' may cause a hang. +func SetUp() + if has("gui_kde") + set guifont=Courier\ 10\ Pitch/8/-1/5/50/0/0/0/0/0 + endif +endfunc + +" Test for resetting "secure" flag after GUI has started. +" Must be run first. +func Test_1_set_secure() + set exrc secure + gui -f + call assert_equal(1, has('gui_running')) +endfunc + +func Test_shell_command() + new + r !echo 'hello' + call assert_equal('hello', getline(2)) + bwipe! + call assert_true(1, match(execute('winpos'), 'Window position: X \d\+, Y \d\+') >= 0) +endfunc diff --git a/src/version.c b/src/version.c index e69b355c5..992b374d6 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2153, +/**/ 2152, /**/ 2151, |