0
0
mirror of https://github.com/vim/vim.git synced 2025-10-05 05:34:07 -04:00

updated for version 7.3.751

Problem:    Test 61 is flaky, it fails once in a while.
Solution:   When it fails retry once.
This commit is contained in:
Bram Moolenaar
2012-12-05 18:21:32 +01:00
parent 57e4ee4d38
commit 60ec5f35a5
2 changed files with 22 additions and 5 deletions

View File

@@ -47,12 +47,16 @@ report:
$(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) $(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: 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 test1.out: test1.in
-rm -f $*.failed tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok X* viminfo -rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START)
$(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in $(RUN_VIM) $*.in
@/bin/sh -c "if diff test.out $*.ok; \ @/bin/sh -c "if diff test.out $*.ok; \
then mv -f test.out $*.out; \ then mv -f test.out $*.out; \
else echo; \ else echo; \
@@ -61,11 +65,22 @@ test1.out: test1.in
-rm -rf X* viminfo -rm -rf X* viminfo
.in.out: .in.out:
-rm -rf $*.failed test.ok test.out X* viminfo -rm -rf $*.failed test.ok $(RM_ON_RUN)
cp $*.ok test.ok cp $*.ok test.ok
# Sleep a moment to avoid that the xterm title is messed up # Sleep a moment to avoid that the xterm title is messed up
@-sleep .2 @-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\ @/bin/sh -c "if test -f test.out; then\
if diff test.out $*.ok; \ if diff test.out $*.ok; \
then mv -f test.out $*.out; \ then mv -f test.out $*.out; \

View File

@@ -725,6 +725,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
751,
/**/ /**/
750, 750,
/**/ /**/