[PATCH 1/3] programs/cmd: %time% should have 1/100s resolution.
Stub out the subsecond decimals. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52719 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- GetTimeFormatEx() does not support formatting fractions of a second. So just stub out that until there is a need for it. At least now echo %time% can be used to see where a batch file spends its time. --- programs/cmd/tests/test_builtins.cmd | 9 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ programs/cmd/wcmdmain.c | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3f410e55166..8133268d2dd 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1789,6 +1789,15 @@ set /a WINE_foo=5 set /a WINE_bar=WINE_foo=6 call :checkenvvars WINE_foo 6 WINE_bar 6 +echo --- Magic environment variables +echo Century=%date:~6,2% + +set WINE_foo=%time:~7,1% +if not defined WINE_foo echo "No seconds in %%time%%" + +set WINE_foo=%random% +if %WINE_foo% equ %random% echo "%%random%% is not random" + echo --- for /F mkdir foobar & cd foobar echo ------ string argument diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8b6e0914112..e95fa0256b1 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1216,6 +1216,8 @@ WINE_foo correctly 7 WINE_foo correctly 8(a)or_broken@ERROR: WINE_foo incorrectly 4 [8] WINE_foo correctly 6(a)or_broken@ERROR: WINE_foo incorrectly 5 [6] WINE_bar correctly 6(a)or_broken@ERROR: WINE_bar incorrectly 5 [6] +--- Magic environment variables +Century=20 --- for /F ------ string argument a diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index af54b209d83..cd083449ffe 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -621,8 +621,11 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR startchar) NULL, thisVarContents, MAXSTRING); len = lstrlenW(thisVarContents); } else if (WCMD_is_magic_envvar(thisVar, L"TIME")) { - GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, NULL, + GetTimeFormatW(LOCALE_USER_DEFAULT, 0, NULL, NULL, thisVarContents, MAXSTRING); + /* FIXME This should have 1/100s precision as well as a localized + * decimal separator */ + lstrcatW(thisVarContents, L".00"); len = lstrlenW(thisVarContents); } else if (WCMD_is_magic_envvar(thisVar, L"CD")) { GetCurrentDirectoryW(MAXSTRING, thisVarContents); -- 2.30.2
The expanded string length must include the trailing null character for 'magic' environment variables too. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Compare the lstrlenW() return value with ExpandEnvironmentStringsW()'s. --- programs/cmd/tests/test_builtins.cmd | 7 +++++++ programs/cmd/wcmdmain.c | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 8133268d2dd..d8150692b54 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1791,9 +1791,16 @@ call :checkenvvars WINE_foo 6 WINE_bar 6 echo --- Magic environment variables echo Century=%date:~6,2% +set WINE_foo=%date:~9,1% +if not defined WINE_foo echo "%%date%% is too short" +rem But may be longer depending on locale set WINE_foo=%time:~7,1% if not defined WINE_foo echo "No seconds in %%time%%" +set WINE_foo=%time:~10,1% +if not defined WINE_foo echo "No 1/100s in %%time%%" +set WINE_foo=%time:~11,1% +if defined WINE_foo echo "Found more time at the end of %%time%%" set WINE_foo=%random% if %WINE_foo% equ %random% echo "%%random%% is not random" diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index cd083449ffe..fbded294741 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -615,24 +615,24 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR startchar) /* override if existing env var called that name */ if (WCMD_is_magic_envvar(thisVar, L"ERRORLEVEL")) { wsprintfW(thisVarContents, L"%d", errorlevel); - len = lstrlenW(thisVarContents); + len = lstrlenW(thisVarContents) + 1; } else if (WCMD_is_magic_envvar(thisVar, L"DATE")) { GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, thisVarContents, MAXSTRING); - len = lstrlenW(thisVarContents); + len = lstrlenW(thisVarContents) + 1; } else if (WCMD_is_magic_envvar(thisVar, L"TIME")) { GetTimeFormatW(LOCALE_USER_DEFAULT, 0, NULL, NULL, thisVarContents, MAXSTRING); /* FIXME This should have 1/100s precision as well as a localized * decimal separator */ lstrcatW(thisVarContents, L".00"); - len = lstrlenW(thisVarContents); + len = lstrlenW(thisVarContents) + 1; } else if (WCMD_is_magic_envvar(thisVar, L"CD")) { GetCurrentDirectoryW(MAXSTRING, thisVarContents); - len = lstrlenW(thisVarContents); + len = lstrlenW(thisVarContents) + 1; } else if (WCMD_is_magic_envvar(thisVar, L"RANDOM")) { wsprintfW(thisVarContents, L"%d", rand() % 32768); - len = lstrlenW(thisVarContents); + len = lstrlenW(thisVarContents) + 1; } else { len = ExpandEnvironmentStringsW(thisVar, thisVarContents, ARRAY_SIZE(thisVarContents)); -- 2.30.2
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=111125 Your paranoid android. === w7u_2qxl (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w7u_adm (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w7u_el (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/0', wanted 'Century=20') === w8 (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w8adm (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w864 (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w1064v1507 (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w1064v1809 (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w1064 (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w1064_tsign (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w10pro64 (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w864 (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w1064v1507 (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w1064v1809 (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w1064 (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w1064_2qxl (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w1064_tsign (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w10pro64 (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w10pro64_ar (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w10pro64_he (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === debian11 (32 bit Chinese:China report) === Report validation errors: batch: Timeout === debian11 (build log) === WineRunWineTest.pl:error: The task timed out
They just output the date / time, without any explanatory text. Furthermore time /t only returns the time down to the minute. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Unlike echo %time%, though that's broken too in Wine. --- programs/cmd/builtins.c | 19 ++++++++++++++----- programs/cmd/tests/test_builtins.cmd | 7 +++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 963a9eaf361..d8dfe732a44 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3503,14 +3503,17 @@ void WCMD_setshow_date (void) { if (!*param1) { if (GetDateFormatW(LOCALE_USER_DEFAULT, 0, NULL, NULL, curdate, ARRAY_SIZE(curdate))) { - WCMD_output (WCMD_LoadMessage(WCMD_CURRENTDATE), curdate); if (wcsstr(quals, L"/T") == NULL) { + WCMD_output (WCMD_LoadMessage(WCMD_CURRENTDATE), curdate); WCMD_output (WCMD_LoadMessage(WCMD_NEWDATE)); WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, ARRAY_SIZE(buffer), &count); if (count > 2) { WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); } } + else { + WCMD_output (curdate); + } } else WCMD_print_error (); } @@ -4291,17 +4294,23 @@ void WCMD_setshow_time (void) { if (!*param1) { GetLocalTime(&st); - if (GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, curtime, ARRAY_SIZE(curtime))) { - WCMD_output (WCMD_LoadMessage(WCMD_CURRENTTIME), curtime); - if (wcsstr(quals, L"/T") == NULL) { + if (wcsstr(quals, L"/T") == NULL) { + if (GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, curtime, ARRAY_SIZE(curtime))) { + WCMD_output (WCMD_LoadMessage(WCMD_CURRENTTIME), curtime); WCMD_output (WCMD_LoadMessage(WCMD_NEWTIME)); WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, ARRAY_SIZE(buffer), &count); if (count > 2) { WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); } } + else WCMD_print_error (); + } + else { + if (GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &st, NULL, curtime, ARRAY_SIZE(curtime))) { + WCMD_output (curtime); + } + else WCMD_print_error (); } - else WCMD_print_error (); } else { WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index d8150692b54..7d61589a4a9 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1794,6 +1794,8 @@ echo Century=%date:~6,2% set WINE_foo=%date:~9,1% if not defined WINE_foo echo "%%date%% is too short" rem But may be longer depending on locale +for /f "usebackq tokens=*" %%i in (`date /t`) do set WINE_foo=%%i +if not "%Wine_foo%"=="%date%" echo "date /t vs %%date%% mismatch" set WINE_foo=%time:~7,1% if not defined WINE_foo echo "No seconds in %%time%%" @@ -1801,6 +1803,11 @@ set WINE_foo=%time:~10,1% if not defined WINE_foo echo "No 1/100s in %%time%%" set WINE_foo=%time:~11,1% if defined WINE_foo echo "Found more time at the end of %%time%%" +rem Make sure to avoid failures on minute ticks +set WINE_before=%time:~0,5% +for /f "usebackq tokens=*" %%i in (`time /t`) do set WINE_foo=%%i +set WINE_after=%time:~0,5% +if not "%WINE_foo%"=="%WINE_before%" if not "%WINE_foo%"=="%WINE_after%" echo "time /t vs %%time%% mismatch" set WINE_foo=%random% if %WINE_foo% equ %random% echo "%%random%% is not random" -- 2.30.2
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=111126 Your paranoid android. === w7u_2qxl (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w7u_adm (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w7u_el (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/0', wanted 'Century=20') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w8 (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w8adm (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w864 (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w1064v1507 (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w1064v1809 (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w1064 (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w1064_tsign (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w10pro64 (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w864 (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w1064v1507 (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w1064v1809 (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w1064 (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w1064_2qxl (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w1064_tsign (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w10pro64 (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w10pro64_ar (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w10pro64_he (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w10pro64_ja (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === w10pro64_zh_CN (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1221 (got '"date /t vs %date% mismatch"', wanted '--- for /F') batch.c:321: Test failed: unexpected char 0x22 position 0 in line 1222 (got '"time /t vs %time% mismatch"', wanted '--- for /F') === debian11 (32 bit Chinese:China report) === Report validation errors: batch: Timeout === debian11 (build log) === WineRunWineTest.pl:error: The task timed out
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=111124 Your paranoid android. === w7u_2qxl (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w7u_adm (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w7u_el (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/0', wanted 'Century=20') === w8 (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w8adm (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w864 (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w1064v1507 (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w1064v1809 (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w1064 (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w1064_tsign (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w10pro64 (32 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w864 (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w1064v1507 (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w1064v1809 (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w1064 (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w1064_2qxl (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w1064_tsign (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w10pro64 (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w10pro64_ar (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === w10pro64_he (64 bit report) === cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20') === debian11 (32 bit Chinese:China report) === Report validation errors: batch: Timeout === debian11 (build log) === WineRunWineTest.pl:error: The task timed out
On Wed, 23 Mar 2022, Marvin wrote: [...]
=== w7u_2qxl (32 bit report) ===
cmd.exe: batch.c:321: Test failed: unexpected char 0x2f position 8 in line 1220 (got 'Century=/2', wanted 'Century=20')
Strange. This patchset needs some adjustment obviously so I'll adjust it and resubmit. -- Francois Gouget <fgouget(a)codeweavers.com>
participants (2)
-
Francois Gouget -
Marvin