From 6484f338a4443da7bc8752ce2abee13b44235990 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 11 Sep 2023 10:58:04 +0800 Subject: vim-patch:9.0.1893: CI: strptime test fails on BSD14 Problem: CI: strptime test fails on BSD14 Solution: Skip the test https://github.com/vim/vim/commit/983d808674f998eaea12b302028de45f1c6857cd Co-authored-by: Christian Brabandt --- test/old/testdir/check.vim | 8 ++++++++ test/old/testdir/test_functions.vim | 3 +++ 2 files changed, 11 insertions(+) diff --git a/test/old/testdir/check.vim b/test/old/testdir/check.vim index 281514db17..af1a80250c 100644 --- a/test/old/testdir/check.vim +++ b/test/old/testdir/check.vim @@ -100,6 +100,14 @@ func CheckLinux() endif endfunc +" Command to check for not running on a BSD system. +command CheckNotBSD call CheckNotBSD() +func CheckNotBSD() + if has('bsd') + throw 'Skipped: does not work on BSD' + endif +endfunc + " Command to check that making screendumps is supported. " Caller must source screendump.vim command CheckScreendump call CheckScreendump() diff --git a/test/old/testdir/test_functions.vim b/test/old/testdir/test_functions.vim index a811e01301..439068445d 100644 --- a/test/old/testdir/test_functions.vim +++ b/test/old/testdir/test_functions.vim @@ -290,6 +290,7 @@ endfunc func Test_strptime() CheckFunction strptime + CheckNotBSD CheckNotMSWindows if exists('$TZ') @@ -305,6 +306,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")) -- cgit From e8d25675a294415ae66fd37fc5ab5a6ab78d7fb6 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 11 Sep 2023 10:58:25 +0800 Subject: vim-patch:9.0.1894: CI: trailing whitespace in tests Problem: CI: trailing white space in tests Solution: clean up the trailing white space https://github.com/vim/vim/commit/e5f7cd0a60d0eeab84f7aeb35c13d3af7e50072e Co-authored-by: Christian Brabandt --- test/old/testdir/test_functions.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/old/testdir/test_functions.vim b/test/old/testdir/test_functions.vim index 439068445d..3e1e5a4816 100644 --- a/test/old/testdir/test_functions.vim +++ b/test/old/testdir/test_functions.vim @@ -306,7 +306,7 @@ func Test_strptime() call assert_fails('call strptime()', 'E119:') call assert_fails('call strptime("xxx")', 'E119:') - " This fails on BSD 14 and returns + " This fails on BSD 14 and returns " -2209078800 instead of 0 call assert_equal(0, strptime("%Y", '')) call assert_equal(0, strptime("%Y", "xxx")) -- cgit