diff options
| author | Bram Moolenaar <bram@vim.org> | 2013-04-24 12:56:19 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2013-04-24 12:56:19 +0200 |
| commit | 32c393df6b277226ada3f8bfaf00b071cec6faa5 (patch) | |
| tree | cec1fb6ef0aa96648a8c088a7b846300d62aa880 | |
| parent | 6f06bbcddf4b600b7fdd6916e798c489ea17951a (diff) | |
| download | vim-32c393df6b277226ada3f8bfaf00b071cec6faa5.tar.gz | |
Problem: The "sleep .2" for running tests does not work on Solaris.
Solution: Fall back to using "sleep 1". (Laurent Blume)
| -rw-r--r-- | src/testdir/Makefile | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/testdir/Makefile b/src/testdir/Makefile index bcaed91d..f76f6459 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -69,8 +69,10 @@ test1.out: test1.in .in.out: -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 + # Sleep a moment to avoid that the xterm title is messed up. + # 200 msec is sufficient, but only modern sleep supports a fraction of + # a second, fall back to a second if it fails. + @-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1" -$(RUN_VIM) $*.in # For flaky tests retry one time. diff --git a/src/version.c b/src/version.c index c745b1c4..a28cf6c3 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 906, +/**/ 905, /**/ 904, |