January 2020 - Wine-commits

Alexandre Julliard : mshtml/tests: Get rid of strstrW().
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: 0f15851e03462251ee9b67674959374f72e0afea URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f15851e03462251ee9b6767… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 26 10:52:30 2020 +0100 mshtml/tests: Get rid of strstrW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 141d2378db..2dcc1eecf1 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -297,18 +297,6 @@ static BOOL wstr_contains(const WCHAR *strw, const char *stra) return strstr(buf, stra) != NULL; } -static const WCHAR *strstrW( const WCHAR *str, const WCHAR *sub ) -{ - while (*str) - { - const WCHAR *p1 = str, *p2 = sub; - while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } - if (!*p2) return str; - str++; - } - return NULL; -} - static BSTR a2bstr(const char *str) { BSTR ret; @@ -7853,7 +7841,7 @@ static void test_cookies(IHTMLDocument2 *doc) ok(b, "InternetGetCookieW failed: %08x\n", GetLastError()); ok(!lstrcmpW(buf, str2), "cookie = %s, expected %s\n", wine_dbgstr_w(str2), wine_dbgstr_w(buf)); if(str2) - ok(strstrW(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2)); + ok(wcsstr(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2)); SysFreeString(str); SysFreeString(str2); @@ -7870,7 +7858,7 @@ static void test_cookies(IHTMLDocument2 *doc) ok(b, "InternetGetCookieW failed: %08x\n", GetLastError()); ok(!lstrcmpW(buf, str2), "cookie = %s, expected %s\n", wine_dbgstr_w(str2), wine_dbgstr_w(buf)); if(str2) - ok(strstrW(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2)); + ok(wcsstr(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2)); SysFreeString(str); SysFreeString(str2); }

1 0

Alexandre Julliard : oleaut32/tests: Get rid of strcmpW().
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: 0053ab28e6963b6c9a1931082dea5f2e37d707ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=0053ab28e6963b6c9a193108… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 26 10:57:03 2020 +0100 oleaut32/tests: Get rid of strcmpW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/varformat.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 394b97991e..9e4cc063f9 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -50,18 +50,12 @@ static BOOL has_i8; #define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \ if (!p##func) { win_skip("function " # func " not available, not testing it\n"); return; } -static inline int strcmpW( const WCHAR *str1, const WCHAR *str2 ) -{ - while (*str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - #define FMT_NUMBER(vt,val) \ VariantInit(&v); V_VT(&v) = vt; val(&v) = 1; \ hres = pVarFormatNumber(&v,2,0,0,0,0,&str); \ ok(hres == S_OK, "VarFormatNumber (vt %d): returned %8x\n", vt, hres); \ if (hres == S_OK) { \ - ok(str && strcmpW(str,szResult1) == 0, \ + ok(str && wcscmp(str,szResult1) == 0, \ "VarFormatNumber (vt %d): string different\n", vt); \ SysFreeString(str); \ } @@ -107,7 +101,7 @@ static void test_VarFormatNumber(void) hres = pVarFormatNumber(&v,2,0,0,0,0,&str); ok(hres == S_OK, "VarFormatNumber (bstr): returned %8x\n", hres); if (hres == S_OK) - ok(str && strcmpW(str, szResult1) == 0, "VarFormatNumber (bstr): string different\n"); + ok(str && wcscmp(str, szResult1) == 0, "VarFormatNumber (bstr): string different\n"); SysFreeString(V_BSTR(&v)); SysFreeString(str); @@ -115,7 +109,7 @@ static void test_VarFormatNumber(void) hres = pVarFormatNumber(&v,2,0,-1,0,0,&str); ok(hres == S_OK, "VarFormatNumber (bstr): returned %8x\n", hres); if (hres == S_OK) - ok(str && strcmpW(str, szResult2) == 0, "VarFormatNumber (-bstr): string different\n"); + ok(str && wcscmp(str, szResult2) == 0, "VarFormatNumber (-bstr): string different\n"); SysFreeString(V_BSTR(&v)); SysFreeString(str); } @@ -582,7 +576,7 @@ static void test_VarFormatFromTokens(void) ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); hres = VarFormatFromTokens(&var, number_fmt, buff, 0, &bstr, lcid); ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); - ok(!strcmpW(bstr, number_us), "incorrectly formatted number: %s\n", wine_dbgstr_w(bstr)); + ok(!wcscmp(bstr, number_us), "incorrectly formatted number: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); lcid = MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), SORT_DEFAULT); @@ -590,7 +584,7 @@ static void test_VarFormatFromTokens(void) ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); hres = VarFormatFromTokens(&var, number_fmt, buff, 0, &bstr, lcid); ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); - ok(!strcmpW(bstr, number), "incorrectly formatted number: %s\n", wine_dbgstr_w(bstr)); + ok(!wcscmp(bstr, number), "incorrectly formatted number: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); VariantClear(&var); @@ -603,7 +597,7 @@ static void test_VarFormatFromTokens(void) ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); hres = VarFormatFromTokens(&var, date_fmt, buff, 0, &bstr, lcid); ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); - ok(!strcmpW(bstr, date_us), "incorrectly formatted date: %s\n", wine_dbgstr_w(bstr)); + ok(!wcscmp(bstr, date_us), "incorrectly formatted date: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); lcid = MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), SORT_DEFAULT); @@ -611,7 +605,7 @@ static void test_VarFormatFromTokens(void) ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); hres = VarFormatFromTokens(&var, date_fmt, buff, 0, &bstr, lcid); ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); - ok(!strcmpW(bstr, date), "incorrectly formatted date: %s\n", wine_dbgstr_w(bstr)); + ok(!wcscmp(bstr, date), "incorrectly formatted date: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); VariantClear(&var); @@ -624,7 +618,7 @@ static void test_VarFormatFromTokens(void) ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); hres = VarFormatFromTokens(&var, string_fmt, buff, 0, &bstr, lcid); ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); - ok(!strcmpW(bstr, string_us), "incorrectly formatted string: %s\n", wine_dbgstr_w(bstr)); + ok(!wcscmp(bstr, string_us), "incorrectly formatted string: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); lcid = MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), SORT_DEFAULT); @@ -632,7 +626,7 @@ static void test_VarFormatFromTokens(void) ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); hres = VarFormatFromTokens(&var, string_fmt, buff, 0, &bstr, lcid); ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); - ok(!strcmpW(bstr, string_de), "incorrectly formatted string: %s\n", wine_dbgstr_w(bstr)); + ok(!wcscmp(bstr, string_de), "incorrectly formatted string: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); }

1 0

Alexandre Julliard : adsldp/tests: Get rid of strchrW().
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: c334d250beee5de1656a12132c46e05df6f7c034 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c334d250beee5de1656a1213… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 26 10:53:33 2020 +0100 adsldp/tests: Get rid of strchrW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/tests/sysinfo.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/adsldp/tests/sysinfo.c b/dlls/adsldp/tests/sysinfo.c index db982aa82f..f2fc92a1b2 100644 --- a/dlls/adsldp/tests/sysinfo.c +++ b/dlls/adsldp/tests/sysinfo.c @@ -33,12 +33,6 @@ #include "wine/test.h" -static WCHAR *strchrW(const WCHAR *str, WCHAR ch) -{ - do { if (*str == ch) return (WCHAR *)(ULONG_PTR)str; } while (*str++); - return NULL; -} - static void test_ComputerName(void) { static const WCHAR cnW[] = { 'C','N','=' }; @@ -70,7 +64,7 @@ static void test_ComputerName(void) ok(size == lstrlenW(buf) + 1, "got %u, expected %u\n", size, lstrlenW(buf) + 1); ok(!memcmp(buf, cnW, sizeof(cnW)), "got %s\n", wine_dbgstr_w(buf)); ok(!memcmp(buf + 3, name, name_size), "got %s (name_size = %u)\n", wine_dbgstr_w(buf), name_size); - p = strchrW(buf, ','); + p = wcschr(buf, ','); ok(p != NULL, "delimiter was not found\n"); ok(p && !memcmp(p + 1, ComputersW, sizeof(ComputersW)), "got %s\n", p ? wine_dbgstr_w(p + 1) : wine_dbgstr_w(buf)); } @@ -120,7 +114,7 @@ static void test_UserName(void) ok(size == lstrlenW(buf), "got %u, expected %u\n", size, lstrlenW(buf)); ok(!memcmp(buf, cnW, sizeof(cnW)), "got %s\n", wine_dbgstr_w(buf)); ok(!memcmp(buf + 3, name, name_size), "got %s (name_size = %u)\n", wine_dbgstr_w(buf), name_size); - p = strchrW(buf, ','); + p = wcschr(buf, ','); ok(p != NULL, "delimiter was not found\n"); ok(p && !memcmp(p + 1, UsersW, sizeof(UsersW)), "got %s\n", p ? wine_dbgstr_w(p + 1) : wine_dbgstr_w(buf)); }

1 0

Alexandre Julliard : crypt32/tests: Get rid of strncmpW().
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: d5a5f53b58b3346a4d8d2e2c27d20f1ae7133662 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5a5f53b58b3346a4d8d2e2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 26 10:54:47 2020 +0100 crypt32/tests: Get rid of strncmpW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/encode.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index cea948151c..38d2f84db1 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1922,13 +1922,6 @@ static void test_encodeUnicodeNameValue(DWORD dwEncoding) } } -static inline int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) -{ - if (n <= 0) return 0; - while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - static void test_decodeUnicodeNameValue(DWORD dwEncoding) { DWORD i; @@ -1951,7 +1944,7 @@ static void test_decodeUnicodeNameValue(DWORD dwEncoding) ok(value->dwValueType == unicodeResults[i].valueType, "Expected value type %d, got %d\n", unicodeResults[i].valueType, value->dwValueType); - ok(!strncmpW((LPWSTR)value->Value.pbData, unicodeResults[i].str, + ok(!wcsncmp((LPWSTR)value->Value.pbData, unicodeResults[i].str, value->Value.cbData / sizeof(WCHAR)), "Unexpected decoded value for index %d (value type %d)\n", i, unicodeResults[i].valueType);

1 0

Alexandre Julliard : devenum/tests: Get rid of strchrW() and strncmpW().
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: 280e51e114c57550cab6aae773be589a21c2e7af URL: https://source.winehq.org/git/wine.git/?a=commit;h=280e51e114c57550cab6aae7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 26 10:55:25 2020 +0100 devenum/tests: Get rid of strchrW() and strncmpW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/tests/devenum.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 945bc67919..726f2bf2cd 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -46,19 +46,6 @@ static const WCHAR swW[] = {'s','w',':',0}; static const WCHAR cmW[] = {'c','m',':',0}; static const WCHAR backslashW[] = {'\\',0}; -static inline WCHAR *strchrW( const WCHAR *str, WCHAR ch ) -{ - do { if (*str == ch) return (WCHAR *)str; } while (*str++); - return NULL; -} - -static inline int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) -{ - if (n <= 0) return 0; - while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - static void test_devenum(IBindCtx *bind_ctx) { IEnumMoniker *enum_cat, *enum_moniker; @@ -762,7 +749,7 @@ static void test_waveout(void) StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); lstrcatW(buffer, backslashW); lstrcatW(buffer, waveW); - lstrcatW(buffer, strchrW(endpoint, '}') + 2); + lstrcatW(buffer, wcschr(endpoint, '}') + 2); mon = check_display_name(parser, buffer); @@ -773,7 +760,7 @@ static void test_waveout(void) } ok(hr == S_OK, "Read failed: %#x\n", hr); - ok(!strncmpW(name, V_BSTR(&var), lstrlenW(name)), "expected %s, got %s\n", + ok(!wcsncmp(name, V_BSTR(&var), lstrlenW(name)), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); @@ -848,7 +835,7 @@ static void test_wavein(void) StringFromGUID2(&CLSID_AudioInputDeviceCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); lstrcatW(buffer, backslashW); lstrcatW(buffer, waveW); - lstrcatW(buffer, strchrW(endpoint, '}') + 2); + lstrcatW(buffer, wcschr(endpoint, '}') + 2); mon = check_display_name(parser, buffer); @@ -859,7 +846,7 @@ static void test_wavein(void) } ok(hr == S_OK, "Read failed: %#x\n", hr); - ok(!strncmpW(caps.szPname, V_BSTR(&var), lstrlenW(caps.szPname)), "expected %s, got %s\n", + ok(!wcsncmp(caps.szPname, V_BSTR(&var), lstrlenW(caps.szPname)), "expected %s, got %s\n", wine_dbgstr_w(caps.szPname), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var);

1 0

Francois Gouget : testbot: Return log access errors in the BadLog field for ParseWineTestRepor().
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: tools Branch: master Commit: 698fee7468e001789638d6a60aa6d81a36511427 URL: https://source.winehq.org/git/tools.git/?a=commit;h=698fee7468e001789638d6a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 27 03:29:31 2020 +0100 testbot: Return log access errors in the BadLog field for ParseWineTestRepor(). This makes diagnosis easier for the ParseWineTestRepor() callers and matches ParseTaskLog(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 5 +---- testbot/bin/WineRunTask.pl | 6 +++--- testbot/bin/WineRunWineTest.pl | 6 +++--- testbot/lib/WineTestBot/LogUtils.pm | 5 ++++- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 00a6f23..f5205f2 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -191,10 +191,7 @@ sub BuildErrFile($$$$) my $TaskKey = Path2TaskKey($Dir); my $LogInfo = ParseWineTestReport("$Dir/$ReportName", $IsWineTest, $TaskTimedOut); - if (!defined $LogInfo->{Failures} and @{$LogInfo->{Extra}} == 1) - { - return "$TaskKey: $LogInfo->{Extra}->[0]"; - } + return "$TaskKey: $LogInfo->{BadLog}" if (defined $LogInfo->{BadLog}); return undef if (!@{$LogInfo->{Extra}}); Debug("$TaskKey: Creating $ReportName.err\n"); diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 3044cd7..7c8c570 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -558,12 +558,12 @@ if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) my $LogInfo = ParseWineTestReport("$TaskDir/$RptFileName", $IsWineTest, $TaskTimedOut); $TaskTimedOut = 1 if ($LogInfo->{TestUnitCount} == $LogInfo->{TimeoutCount}); - if (!defined $LogInfo->{Failures} and @{$LogInfo->{Extra}} == 1) + if (defined $LogInfo->{BadLog}) { # Could not open the file $NewStatus = 'boterror'; - Error "$LogInfo->{Extra}->[0]\n"; - LogTaskError("$LogInfo->{Extra}->[0]\n"); + Error "$LogInfo->{BadLog}\n"; + LogTaskError("$LogInfo->{BadLog}\n"); } else { diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 696e27e..6ca1d28 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -580,12 +580,12 @@ foreach my $Mission (@{$TaskMissions->{Missions}}) my $LogInfo = ParseWineTestReport("$TaskDir/$RptFileName", $Step->FileType eq "patch", $TaskTimedOut); $TaskTimedOut = 1 if ($LogInfo->{TestUnitCount} == $LogInfo->{TimeoutCount}); - if (!defined $LogInfo->{Failures} and @{$LogInfo->{Extra}} == 1) + if (defined $LogInfo->{BadLog}) { # Could not open the file $NewStatus = 'boterror'; - Error "$LogInfo->{Extra}->[0]\n"; - LogTaskError("$LogInfo->{Extra}->[0]\n"); + Error "$LogInfo->{BadLog}\n"; + LogTaskError("$LogInfo->{BadLog}\n"); } else { diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 96840eb..9aa2e81 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -353,6 +353,9 @@ The number of failed tests. =item Extra An array containing the extra errors detected during the inconsistency check. +=item BadLog +Contains an error message if the report could not be read. + =back =back =cut @@ -365,7 +368,7 @@ sub ParseWineTestReport($$$) if (!open($LogFile, "<", $FileName)) { my $LogName = basename($FileName); - return {Extra => ["Unable to open '$LogName' for reading: $!"]}; + return {BadLog => "Unable to open '$LogName' for reading: $!"}; } my $LogInfo = {

1 0

Francois Gouget : testbot/LogUtils: Better report log access errors.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: tools Branch: master Commit: ae308cb87ffb9d8be56dfa47393fe9e6d403e34f URL: https://source.winehq.org/git/tools.git/?a=commit;h=ae308cb87ffb9d8be56dfa4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 27 03:29:14 2020 +0100 testbot/LogUtils: Better report log access errors. GetLogErrors() now sets $LogInfo->{BadLog} when it fails to open a log file. This makes it easier for the caller to identify the issue and report it. Similarly TagNewErrors() sets $LogInfo->{BadRef} when it cannot access the reference log. Furthermore TagNewErrors() also sets $LogInfo->{NoRef} when no reference log could be used to detect new errors, either because the reference log could not be accessed or because there was no reference log in the first place. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 2 +- testbot/lib/WineTestBot/LogUtils.pm | 33 ++++++++++++++++++++++++--------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index fdf7e24..44d7255 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -295,7 +295,7 @@ EOF my $AllNew; my $RefReportPath = $StepTask->GetFullFileName($StepTask->GetRefReportName($LogName)); TagNewErrors($RefReportPath, $LogInfo); - if (!defined $LogInfo->{NewCount}) + if ($LogInfo->{NoRef}) { # Test reports should have reference WineTest results and if not # reporting the errors as new would cause false positives. diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index d05a811..81cff51 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -730,6 +730,9 @@ per dll / program being tested). Returns a hashtable containing: =over +=item BadLog +Contains an error message if the log could not be read. + =item ErrCount The number of errors. This is undefined if no log file was found. @@ -800,8 +803,9 @@ sub GetLogErrors($) } elsif (-f $LogFileName) { + $LogInfo->{BadLog} = "Could not open '". basename($LogFileName) ."' for reading: $!"; my $Group = _AddLogGroup($LogInfo, "TestBot errors"); - _AddLogError($LogInfo, $Group, "Could not open '". basename($LogFileName) ."' for reading: $!"); + _AddLogError($LogInfo, $Group, $LogInfo->{BadLog}); } if (open(my $LogFile, "<", "$LogFileName.err")) @@ -825,8 +829,9 @@ sub GetLogErrors($) } elsif (-f "$LogFileName.err") { + $LogInfo->{BadLog} ||= "Could not open '". basename($LogFileName) .".err' for reading: $!"; my $Group = _AddLogGroup($LogInfo, "TestBot errors"); - _AddLogError($LogInfo, $Group, "Could not open '". basename($LogFileName) .".err' for reading: $!"); + _AddLogError($LogInfo, $Group, $LogInfo->{BadLog}); } return $LogInfo; @@ -899,8 +904,16 @@ Compares the specified errors to the reference report to identify new errors. The $LogInfo structure is augmented with the following fields: =over +=item BadRef +Contains an error message if the reference log could not be read. + +=item NoRef +True if there was no usable reference log. This could either mean that there +was no reference log or that the reference log could not be read in which case +BadRef would be set. + =item NewCount -The total number of new errors or undef if the reference log could not be read. +The total number of new errors if any. =item ErrGroups =over @@ -922,16 +935,18 @@ sub TagNewErrors($$) { my ($RefLogPath, $LogInfo) = @_; - if (!$LogInfo->{ErrCount}) + return if (!$LogInfo->{ErrCount}); + + my $RefInfo = GetLogErrors($RefLogPath); + if (defined $RefInfo->{BadLog}) { - $LogInfo->{NewCount} = 0; + # Save the BadLog error but do not tag the errors as new: this is up to + # the caller. + $LogInfo->{BadRef} = $RefInfo->{BadLog} if (-e $RefLogPath); + $LogInfo->{NoRef} = 1; return; } - my $RefInfo = GetLogErrors($RefLogPath); - # Don't tag the errors as new if there is no reference log - return if (!defined $RefInfo->{ErrCount}); - $LogInfo->{NewCount} = 0; foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) {

1 0

Francois Gouget : testbot/LogUtils: Rename the ParseTaskLog() NoLog error field to BadLog.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: tools Branch: master Commit: 788bfee5f2de2a49fc96c7fcd777856937dafbf6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=788bfee5f2de2a49fc96c7f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 27 03:29:24 2020 +0100 testbot/LogUtils: Rename the ParseTaskLog() NoLog error field to BadLog. The log file may exist but not be readable. This makes it consistent with the BadRef / NoRef terminology of TagNewErrors(). Also don't assume that the error message will evaluate to true. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 4 ++-- testbot/bin/WineRunReconfig.pl | 4 ++-- testbot/bin/WineRunWineTest.pl | 4 ++-- testbot/lib/WineTestBot/LogUtils.pm | 5 +++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index cf6428a..9fc5bff 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -433,9 +433,9 @@ if ($TA->GetFile("Build.log", "$TaskDir/log")) $NewStatus = "badpatch"; $TAError = $ErrMessage = undef; } - elsif ($LogInfo->{NoLog}) + elsif (defined $LogInfo->{BadLog}) { - FatalError("$LogInfo->{NoLog}\n", "retry"); + FatalError("$LogInfo->{BadLog}\n", "retry"); } else { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index ba35d54..04c0e26 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -428,9 +428,9 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) $NewStatus = "completed"; $TAError = $ErrMessage = undef; } - elsif ($LogInfo->{NoLog}) + elsif (defined $LogInfo->{BadLog}) { - FatalError("$LogInfo->{NoLog}\n", "retry"); + FatalError("$LogInfo->{BadLog}\n", "retry"); } else { diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 950661b..696e27e 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -542,9 +542,9 @@ if ($TA->GetFile("Task.log", "$TaskDir/log")) $NewStatus = "badpatch"; $TaskFailures = $TAError = $ErrMessage = $PossibleCrash = undef; } - elsif ($LogInfo->{NoLog}) + elsif (defined $LogInfo->{BadLog}) { - FatalError("$LogInfo->{NoLog}\n", "retry"); + FatalError("$LogInfo->{BadLog}\n", "retry"); } elsif ($LogInfo->{Type} eq "build") { diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 81cff51..96840eb 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -81,7 +81,7 @@ Either 'ok' if the task was successful or a code indicating why it failed. Entries named after the binaries and files of interest to the TestBot that have been updated. -=item NoLog +=item BadLog Contains an error message if the task log could not be read. =back @@ -95,7 +95,8 @@ sub ParseTaskLog($) my $LogFile; if (!open($LogFile, "<", $FileName)) { - return {NoLog => "Unable to open the task log for reading: $!"}; + my $LogName = basename($FileName); + return {BadLog => "Unable to open '$LogName' for reading: $!"}; } my $LogInfo = {Type => "build"};

1 0

Jacek Caban : jscript: Store source position in instr_t.
by Alexandre Julliard 24 Jan '20

24 Jan '20

Module: wine Branch: master Commit: 78853e385355c9a3276d180e3e9b856f96cb9ec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78853e385355c9a3276d180e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 24 19:54:41 2020 +0100 jscript: Store source position in instr_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 15 +++++++++++++++ dlls/jscript/engine.h | 1 + dlls/jscript/parser.h | 4 ++++ dlls/jscript/parser.y | 34 +++++++++++++++++++--------------- 4 files changed, 39 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=78853e385355c9a3276d…

1 0

Jacek Caban : jscript/tests: Add more error reporting tests.
by Alexandre Julliard 24 Jan '20

24 Jan '20

Module: wine Branch: master Commit: f58420b4adfe05bca0806a4069b02161955f52c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f58420b4adfe05bca0806a40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 24 20:41:40 2020 +0100 jscript/tests: Add more error reporting tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/run.c | 603 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 428 insertions(+), 175 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f58420b4adfe05bca080…

1 0