Skip to content
Permalink
Browse files

patch 8.0.0430: options test fails or hangs on MS-Windows

Problem:    Options test fails or hangs on MS-Windows.
Solution:   Run it separately instead of part of test_alot.  Use "-S" instead
            of "-u" to run the script.  Fix failures.
  • Loading branch information...
brammool committed Mar 7, 2017
1 parent e8512d7 commit bb962262eb6b18d93161d7506317d215ae80bfe5
@@ -181,6 +181,7 @@ NEW_TESTS = test_arabic.res \
test_netbeans.res \
test_normal.res \
test_number.res \
test_options.res \
test_packadd.res \
test_paste.res \
test_perl.res \
@@ -130,4 +130,4 @@ test_gui_init.res: test_gui_init.vim
@del vimcmd

opt_test.vim: ../option.c gen_opt_test.vim
$(VIMPROG) -u gen_opt_test.vim --noplugin --not-a-term ../option.c
$(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../option.c
@@ -133,4 +133,4 @@ test_gui_init.res: test_gui_init.vim
@$(DEL) vimcmd

opt_test.vim: ../option.c gen_opt_test.vim
$(VIMPROG) -u gen_opt_test.vim --noplugin --not-a-term ../option.c
$(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../option.c
@@ -142,4 +142,4 @@ test_gui_init.res: test_gui_init.vim
@rm vimcmd

opt_test.vim: ../option.c gen_opt_test.vim
$(VIMPROG) -u gen_opt_test.vim --noplugin --not-a-term ../option.c
$(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../option.c
@@ -13,7 +13,6 @@ let script = [
\ 'let save_term = &term',
\ ]

edit
/#define p_term
let end = line('.')

@@ -30,6 +29,7 @@ let test_values = {
\ 'iminsert': [[0, 1], [-1, 3, 999]],
\ 'imsearch': [[-1, 0, 1], [-2, 3, 999]],
\ 'lines': [[2, 24], [-1, 0, 1]],
\ 'linespace': [[0, 2, 4], ['']],
\ 'numberwidth': [[1, 4, 8, 10], [-1, 0, 11]],
\ 'regexpengine': [[0, 1, 2], [-1, 3, 999]],
\ 'report': [[0, 1, 2, 9999], [-1]],
@@ -59,7 +59,7 @@ let test_values = {
\ 'backupext': [['xxx'], ['']],
\ 'belloff': [['', 'all', 'copy,error'], ['xxx']],
\ 'breakindentopt': [['', 'min:3', 'sbr'], ['xxx', 'min', 'min:x']],
\ 'browsedir': [['', 'last', '/tmp/'], ['xxx']],
\ 'browsedir': [['', 'last', '/'], ['xxx']],
\ 'bufhidden': [['', 'hide', 'wipe'], ['xxx', 'hide,wipe']],
\ 'buftype': [['', 'help', 'nofile'], ['xxx', 'help,nofile']],
\ 'casemap': [['', 'internal'], ['xxx']],
@@ -89,6 +89,8 @@ let test_values = {
\ 'foldmarker': [['((,))'], ['', 'xxx']],
\ 'formatoptions': [['', 'vt', 'v,t'], ['xxx']],
\ 'guicursor': [['', 'n:block-Cursor'], ['xxx']],
\ 'guifont': [['', 'fixedsys'], []],
\ 'guifontwide': [['', 'fixedsys'], []],
\ 'helplang': [['', 'de', 'de,it'], ['xxx']],
\ 'highlight': [['', 'e:Error'], ['xxx']],
\ 'isfname': [['', '@', '@,48-52'], ['xxx', '@48']],
@@ -108,6 +110,7 @@ let test_values = {
\ 'printmbfont': [['', 'r:some', 'b:Bold,c:yes'], ['xxx']],
\ 'printoptions': [['', 'header:0', 'left:10pc,top:5pc'], ['xxx']],
\ 'scrollopt': [['', 'ver', 'ver,hor'], ['xxx']],
\ 'renderoptions': [['', 'type:directx'], ['xxx']],
\ 'selection': [['old', 'inclusive'], ['', 'xxx']],
\ 'selectmode': [['', 'mouse', 'key,cmd'], ['xxx']],
\ 'sessionoptions': [['', 'blank', 'help,options,slash'], ['xxx']],
@@ -116,11 +119,11 @@ let test_values = {
\ 'spellsuggest': [['', 'best', 'double,33'], ['xxx']],
\ 'switchbuf': [['', 'useopen', 'split,newtab'], ['xxx']],
\ 'tagcase': [['smart', 'match'], ['', 'xxx', 'smart,match']],
\ 'term': [['ansi'], ['', 'gui']],
\ 'term': [[], []],
\ 'toolbar': [['', 'icons', 'text'], ['xxx']],
\ 'toolbariconsize': [['', 'tiny', 'huge'], ['xxx']],
\ 'ttymouse': [['', 'xterm'], ['xxx']],
\ 'ttytype': [['ansi'], ['', 'gui']],
\ 'ttytype': [[], []],
\ 'viewoptions': [['', 'cursor', 'unix,slash'], ['xxx']],
\ 'viminfo': [['', '''50', '"30'], ['xxx']],
\ 'virtualedit': [['', 'all', 'all,block'], ['xxx']],
@@ -189,6 +192,8 @@ while 1

if name == 'more'
call add(script, 'set nomore')
elseif name == 'lines'
call add(script, 'let &lines = save_lines')
endif
endif
endwhile
@@ -50,4 +50,3 @@ source test_timers.vim
source test_true_false.vim
source test_unlet.vim
source test_window_cmd.vim
source test_options.vim
@@ -764,6 +764,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
430,
/**/
429,
/**/

0 comments on commit bb96226

Please sign in to comment.
You can’t perform that action at this time.