diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-06-18 23:07:37 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-06-18 23:07:37 +0200 |
| commit | 87652a7e3b94755084944afec51a0bfcd8b0a0c3 (patch) | |
| tree | 13fc67059371554068f186843d630e52f619cf3c | |
| parent | db51730df1817fc4b6ecf5a065c69fac518ad821 (diff) | |
| download | vim-git-87652a7e3b94755084944afec51a0bfcd8b0a0c3.tar.gz | |
patch 8.1.1568: strftime() test fails on MS-Windowsv8.1.1568
Problem: Strftime() test fails on MS-Windows.
Solution: Skip the check for using the $TZ environment variable.
| -rw-r--r-- | src/testdir/test_functions.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
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 @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1568, +/**/ 1567, /**/ 1566, |