updated for version 7.3.751

Problem:    Test 61 is flaky, it fails once in a while.
Solution:   When it fails retry once.

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 76409ce5e2b135c2edf135c8da38487352411984..d29b4f5b151447a0de3ef10bf773cffa663b47fe 100644 (file)
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -47,12 +47,16 @@ report:
 
 $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
 
+RM_ON_RUN = test.out X* viminfo
+RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok
+RUN_VIM = $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in
+
 clean:
-       -rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok X* valgrind.* viminfo
+       -rm -rf *.out *.failed *.rej *.orig test.log $(RM_ON_RUN) $(RM_ON_START) valgrind.*
 
 test1.out: test1.in
-       -rm -f $*.failed tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok X* viminfo
-       $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in
+       -rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START)
+       $(RUN_VIM) $*.in
        @/bin/sh -c "if diff test.out $*.ok; \
                then mv -f test.out $*.out; \
                else echo; \
@@ -61,11 +65,22 @@ test1.out: test1.in
        -rm -rf X* viminfo
 
 .in.out:
-       -rm -rf $*.failed test.ok test.out X* viminfo
+       -rm -rf $*.failed test.ok $(RM_ON_RUN)
        cp $*.ok test.ok
        # Sleep a moment to avoid that the xterm title is messed up
        @-sleep .2
-       -$(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in
+       -$(RUN_VIM) $*.in
+
+       # For flaky tests retry one time.
+       @/bin/sh -c "if test -f test.out -a $* = test61; then \
+                 if diff test.out $*.ok; \
+                 then echo flaky test ok first time; \
+                 else rm -rf $*.failed $(RM_ON_RUN); \
+                       $(RUN_VIM) $*.in; \
+                 fi \
+               fi"
+
+       # Check if the test.out file matches test.ok.
        @/bin/sh -c "if test -f test.out; then\
                  if diff test.out $*.ok; \
                  then mv -f test.out $*.out; \

diff --git a/src/version.c b/src/version.c
index 2987755fc2158d2aa9b683227bd92b6b74876e89..849546e45e369deca753c3d00feadd3e07e7b3a7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    751,
 /**/
     750,
 /**/