From 87652a7e3b94755084944afec51a0bfcd8b0a0c3 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 18 Jun 2019 23:07:37 +0200 Subject: patch 8.1.1568: strftime() test fails on MS-Windows Problem: Strftime() test fails on MS-Windows. Solution: Skip the check for using the $TZ environment variable. --- src/testdir/test_functions.vim | 5 ++++- src/version.c | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim index f71717f73..d574a8bae 100644 --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -202,7 +202,10 @@ func Test_strftime() " are, a tzset(3) call may have failed somewhere call assert_equal(strlen(est), 2) call assert_equal(strlen(utc), 2) - call assert_notequal(est, utc) + " TODO: this fails on MS-Windows + if has('unix') + call assert_notequal(est, utc) + endif " If we cached a timezone value, put it back, otherwise clear it if exists('tz') diff --git a/src/version.c b/src/version.c index 677279b24..68704cc37 100644 --- a/src/version.c +++ b/src/version.c @@ -777,6 +777,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1568, /**/ 1567, /**/ -- cgit v1.2.1