diff options
| author | Christian Brabandt <cb@256bit.org> | 2023-09-10 19:06:09 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-09-10 19:06:09 +0200 |
| commit | 983d808674f998eaea12b302028de45f1c6857cd (patch) | |
| tree | 979b0edbd8803d2f51d58103dd8e6ffdde60429c | |
| parent | 24a95f42b8469944a1e74838438ac8f1d86f9450 (diff) | |
patch 9.0.1893: CI: strptime test fails on BSD14v9.0.1893
Problem: CI: strptime test fails on BSD14
Solution: Skip the test
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/testdir/test_functions.vim | 3 | ||||
| -rw-r--r-- | src/testdir/test_vim9_builtin.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim index b14c5413f0..2ed7eb7f70 100644 --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -300,6 +300,7 @@ endfunc func Test_strptime() CheckFunction strptime + CheckNotBSD if exists('$TZ') let tz = $TZ @@ -314,6 +315,8 @@ func Test_strptime() call assert_fails('call strptime()', 'E119:') call assert_fails('call strptime("xxx")', 'E119:') + " This fails on BSD 14 and returns + " -2209078800 instead of 0 call assert_equal(0, strptime("%Y", '')) call assert_equal(0, strptime("%Y", "xxx")) diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim index dc5f3362b3..0d246a2427 100644 --- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -4343,10 +4343,13 @@ enddef def Test_strptime() CheckFunction strptime + CheckNotBSD if exists_compiled('*strptime') v9.CheckDefAndScriptFailure(['strptime(10, "2021")'], ['E1013: Argument 1: type mismatch, expected string but got number', 'E1174: String required for argument 1']) v9.CheckDefAndScriptFailure(['strptime("%Y", 2021)'], ['E1013: Argument 2: type mismatch, expected string but got number', 'E1174: String required for argument 2']) assert_notequal(0, strptime('%Y', '2021')) + # This fails on BSD 14 and returns + # -2209078800 instead of 0 assert_equal(0, strptime('%Y', '')) endif enddef diff --git a/src/version.c b/src/version.c index 40f7fe944c..ba7ea3970e 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1893, +/**/ 1892, /**/ 1891, |