# HG changeset patch # User Christian Brabandt # Date 1694366102 -7200 # Node ID 45da656d550e4710e84629fa4ec7f58e220e051a # Parent 19db06ae82f76daee0a766622cc9a85f6e7088f1 patch 9.0.1893: CI: strptime test fails on BSD14 Commit: https://github.com/vim/vim/commit/983d808674f998eaea12b302028de45f1c6857cd Author: Christian Brabandt Date: Sun Sep 10 19:06:09 2023 +0200 patch 9.0.1893: CI: strptime test fails on BSD14 Problem: CI: strptime test fails on BSD14 Solution: Skip the test Signed-off-by: Christian Brabandt diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim --- 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 --- 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 --- 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,