summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-05-07 18:16:35 +0200
committerBram Moolenaar <Bram@vim.org>2020-05-07 18:16:35 +0200
commit4a070cc82e00618db279526797564cb2b4e9b060 (patch)
tree64dd33dfddbc67afcfc97ca1da752beb9820d995 /src
parentea554ca4faf4a0b96706ea24130c4f485b24b241 (diff)
patch 8.2.0710: Netbeans test sometimes failsv8.2.0710
Problem: Netbeans test sometimes fails. Solution: Mark any test using an external command as flaky.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/shared.vim3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
index fda4d03e6b..3e0929c349 100644
--- a/src/testdir/shared.vim
+++ b/src/testdir/shared.vim
@@ -36,6 +36,9 @@ endfunc
" Run "cmd". Returns the job if using a job.
func RunCommand(cmd)
+ " Running an external command can occasionally be slow or fail.
+ let g:test_is_flaky = 1
+
let job = 0
if has('job')
let job = job_start(a:cmd, {"stoponexit": "hup"})
diff --git a/src/version.c b/src/version.c
index c7fc8ee325..2004f564d1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 710,
+/**/
709,
/**/
708,