summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-12-29 16:34:06 +0100
committerBram Moolenaar <Bram@vim.org>2015-12-29 16:34:06 +0100
commit52f6ae1366b34fc5771595c0bd17c779a7f6f544 (patch)
treef83b7241cefbb2afa9220e952be9d124dc51493d /src
parent013806229a1e15480592f6bc8453130685ec750b (diff)
patch 7.4.993v7.4.993
Problem: Test 87 is flaky on AppVeyor. Solution: Reduce the minimum background thread count.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test86.in4
-rw-r--r--src/testdir/test87.in4
-rw-r--r--src/version.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/src/testdir/test86.in b/src/testdir/test86.in
index ae8ee3ebf4..4714451eeb 100644
--- a/src/testdir/test86.in
+++ b/src/testdir/test86.in
@@ -370,7 +370,9 @@ EOF
:sleep 1
:py t.running = False
:py t.join()
-:py l[0] = t.t > 7 # check if the background thread is working
+:" Check if the background thread is working. Count should be 10, but on a
+:" busy system (AppVeyor) it can be much lower.
+:py l[0] = t.t > 4
:py del time
:py del threading
:py del t
diff --git a/src/testdir/test87.in b/src/testdir/test87.in
index 7ad05de998..41d406521e 100644
--- a/src/testdir/test87.in
+++ b/src/testdir/test87.in
@@ -367,7 +367,9 @@ EOF
:sleep 1
:py3 t.running = False
:py3 t.join()
-:py3 l[0] = t.t > 7 # check if the background thread is working
+:" Check if the background thread is working. Count should be 10, but on a
+:" busy system (AppVeyor) it can be much lower.
+:py3 l[0] = t.t > 4
:py3 del time
:py3 del threading
:py3 del t
diff --git a/src/version.c b/src/version.c
index 9e77c6dd3e..167f55bd60 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 */
/**/
+ 993,
+/**/
992,
/**/
991,