summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Brabandt <cb@256bit.org>2023-10-04 21:58:24 +0200
committerChristian Brabandt <cb@256bit.org>2023-10-04 21:58:24 +0200
commit85ff0c1912f6d94ed94a6112517e96f64801ba56 (patch)
tree8333056d5f3e3590c98012295fce92e03bbd11f3
parent8e5f26ec6a1446aabffa7a0a7819a7462372a5b8 (diff)
patch 9.0.1984: CI: Test_open_delay*() fails on FreeBSD 14v9.0.1984
Problem: CI: Test_open_delay*() fails on FreeBSD 14 Solution: Skip it on BSD Signed-off-by: Christian Brabandt <cb@256bit.org>
-rw-r--r--src/testdir/test_channel.vim4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 8f1291c22c..5761f213cb 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -1542,12 +1542,16 @@ func Ch_open_delay(port)
endfunc
func Test_open_delay()
+ " This fails on BSD (e.g. Cirrus-CI), why?
+ CheckNotBSD
" The server will wait half a second before creating the port.
call s:run_server('Ch_open_delay', 'delay')
endfunc
func Test_open_delay_ipv6()
CheckIPv6
+ " This fails on BSD (e.g. Cirrus-CI), why?
+ CheckNotBSD
call Test_open_delay()
endfunc
diff --git a/src/version.c b/src/version.c
index 32005545f3..f1934b91b3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1984,
+/**/
1983,
/**/
1982,