summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-09-03 22:08:11 +0100
committerBram Moolenaar <Bram@vim.org>2022-09-03 22:08:11 +0100
commit5fbbec180b623cd6ebfc9528be6fa70b4cf664d4 (patch)
treee63ce17a9ba4c161cfd277d82d0db7c36bcb9fd7
parent06fef1b2bdc07c6170b178e34b4712c21bd81a2e (diff)
patch 9.0.0372: MS-Windows: "%T" time format does not appear to workv9.0.0372
Problem: MS-Windows: "%T" time format does not appear to work. Solution: Use "%H:%M:%S" instead.
-rw-r--r--src/testdir/runtest.vim4
-rw-r--r--src/testdir/shared.vim2
-rw-r--r--src/version.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 91977c9491..72a8f989f8 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -465,7 +465,7 @@ for g:testfunc in sort(s:tests)
" A test can set g:test_is_flaky to retry running the test.
let g:test_is_flaky = 0
- let starttime = strftime("%T")
+ let starttime = strftime("%H:%M:%S")
call RunTheTest(g:testfunc)
" Repeat a flaky test. Give up when:
@@ -499,7 +499,7 @@ for g:testfunc in sort(s:tests)
let v:errors = []
let g:run_nr += 1
- let starttime = strftime("%T")
+ let starttime = strftime("%H:%M:%S")
call RunTheTest(g:testfunc)
if len(v:errors) == 0
diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
index 72cf8368cf..09d942f9a6 100644
--- a/src/testdir/shared.vim
+++ b/src/testdir/shared.vim
@@ -101,7 +101,7 @@ func RunServer(cmd, testfunc, args)
" Wait for some time for the port number to be there.
let port = GetPort()
if port == 0
- call assert_report(strftime("%T") .. " Can't start " .. a:cmd)
+ call assert_report(strftime("%H:%M:%S") .. " Can't start " .. a:cmd)
return
endif
diff --git a/src/version.c b/src/version.c
index d916059410..0209280f03 100644
--- a/src/version.c
+++ b/src/version.c
@@ -708,6 +708,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 372,
+/**/
371,
/**/
370,