diff options
author | Bram Moolenaar <Bram@vim.org> | 2015-12-11 20:53:58 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2015-12-11 20:53:58 +0100 |
commit | b65c749ac5a8a990d53493e3b9677142b1b9e4ce (patch) | |
tree | 2b4fd9078e4782d88480eddb5b6ec28f0564b768 | |
parent | 6b90351786eb0915336b576cc930300bf5c9ac63 (diff) | |
download | vim-git-b65c749ac5a8a990d53493e3b9677142b1b9e4ce.tar.gz |
patch 7.4.968v7.4.968
Problem: test86 and test87 are flaky in Appveyor.
Solution: Reduce the count from 8 to 7. (suggested by ZyX)
-rw-r--r-- | src/testdir/test86.in | 2 | ||||
-rw-r--r-- | src/testdir/test87.in | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test86.in b/src/testdir/test86.in index 32888f836..ae8ee3ebf 100644 --- a/src/testdir/test86.in +++ b/src/testdir/test86.in @@ -370,7 +370,7 @@ EOF :sleep 1 :py t.running = False :py t.join() -:py l[0] = t.t > 8 # check if the background thread is working +:py l[0] = t.t > 7 # check if the background thread is working :py del time :py del threading :py del t diff --git a/src/testdir/test87.in b/src/testdir/test87.in index 2308fde97..7ad05de99 100644 --- a/src/testdir/test87.in +++ b/src/testdir/test87.in @@ -367,7 +367,7 @@ EOF :sleep 1 :py3 t.running = False :py3 t.join() -:py3 l[0] = t.t > 8 # check if the background thread is working +:py3 l[0] = t.t > 7 # check if the background thread is working :py3 del time :py3 del threading :py3 del t diff --git a/src/version.c b/src/version.c index 5a166e700..40a877d43 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 968, +/**/ 967, /**/ 966, |