December 2022 - Wine-Commits

Alexandre Julliard : include: Use proper dllimports for user32 functions.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: d92b59717dc8c3ce1511bcef7c56f887554c2809 URL: https://gitlab.winehq.org/wine/wine/-/commit/d92b59717dc8c3ce1511bcef7c56f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 11:33:13 2022 +0100 include: Use proper dllimports for user32 functions. --- dlls/kernelbase/Makefile.in | 2 +- dlls/win32u/Makefile.in | 2 +- include/dde.h | 4 +++- include/ddeml.h | 4 +++- include/winuser.h | 4 +++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in index 2ea1890c7eb..784fd0e74f7 100644 --- a/dlls/kernelbase/Makefile.in +++ b/dlls/kernelbase/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINBASEAPI= -DWINADVAPI= +EXTRADEFS = -DWINBASEAPI= -DWINADVAPI= -DWINUSERAPI= MODULE = kernelbase.dll IMPORTLIB = kernelbase IMPORTS = uuid ntdll winecrt0 diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index 2cf822401d5..7274f132fa5 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINGDIAPI= +EXTRADEFS = -DWINGDIAPI= -DWINUSERAPI= MODULE = win32u.dll UNIXLIB = win32u.so IMPORTLIB = win32u diff --git a/include/dde.h b/include/dde.h index 4e0d1176727..fda798b06f4 100644 --- a/include/dde.h +++ b/include/dde.h @@ -28,10 +28,12 @@ extern "C" { #endif +#ifndef WINUSERAPI #if defined(_USER32_) || defined(WINE_UNIX_LIB) #define WINUSERAPI #else -#define WINUSERAPI DECLSPEC_HIDDEN +#define WINUSERAPI DECLSPEC_IMPORT +#endif #endif #include <dde.rh> diff --git a/include/ddeml.h b/include/ddeml.h index dcac04bfb19..41c43e6b321 100644 --- a/include/ddeml.h +++ b/include/ddeml.h @@ -26,10 +26,12 @@ extern "C" { #endif /* defined(__cplusplus) */ +#ifndef WINUSERAPI #if defined(_USER32_) || defined(WINE_UNIX_LIB) #define WINUSERAPI #else -#define WINUSERAPI DECLSPEC_HIDDEN +#define WINUSERAPI DECLSPEC_IMPORT +#endif #endif /* Codepage Constants diff --git a/include/winuser.h b/include/winuser.h index a82a6ec26c5..d1e03461d07 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -19,11 +19,13 @@ #ifndef _WINUSER_ #define _WINUSER_ +#ifndef WINUSERAPI #if !defined(_USER32_) && !defined(WINE_UNIX_LIB) -#define WINUSERAPI DECLSPEC_HIDDEN +#define WINUSERAPI DECLSPEC_IMPORT #else #define WINUSERAPI #endif +#endif #ifndef RC_INVOKED #include <stdarg.h>

1 0

Alexandre Julliard : winebuild: Avoid quoting section names.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 4b59142f34bbc19b67786c5c4cf29af55487ae03 URL: https://gitlab.winehq.org/wine/wine/-/commit/4b59142f34bbc19b67786c5c4cf29a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 10:05:07 2022 +0100 winebuild: Avoid quoting section names. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54060 --- tools/winebuild/import.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 515283fb50f..dfda228c4ec 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1764,20 +1764,20 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\t.long 0\n" ); /* UnloadInformationTableRVA */ output( "\t.long 0\n" ); /* TimeDateStamp */ - output( "\n\t.section \".idata$5\"\n" ); + output( "\n\t.section .idata$5\n" ); output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ output( ".L__wine_import_addrs:\n" ); - output( "\n\t.section \".idata$4\"\n" ); + output( "\n\t.section .idata$4\n" ); output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ output( ".L__wine_import_names:\n" ); /* required to avoid internal linker errors with some binutils versions */ - output( "\n\t.section \".idata$2\"\n" ); + output( "\n\t.section .idata$2\n" ); } else { - output( "\n\t.section \".idata$2\"\n" ); + output( "\n\t.section .idata$2\n" ); output( "%s\n", asm_globl( import_desc ) ); output_rva( ".L__wine_import_names" ); /* OriginalFirstThunk */ output( "\t.long 0\n" ); /* TimeDateStamp */ @@ -1785,10 +1785,10 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output_rva( "%s", asm_name( import_name ) ); /* Name */ output_rva( ".L__wine_import_addrs" ); /* FirstThunk */ - output( "\n\t.section \".idata$4\"\n" ); + output( "\n\t.section .idata$4\n" ); output( ".L__wine_import_names:\n" ); /* OriginalFirstThunk head */ - output( "\n\t.section \".idata$5\"\n" ); + output( "\n\t.section .idata$5\n" ); output( ".L__wine_import_addrs:\n" ); /* FirstThunk head */ } @@ -1799,11 +1799,11 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc new_output_as_file(); - output( "\n\t.section \".idata$4\"\n" ); + output( "\n\t.section .idata$4\n" ); output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ - output( "\n\t.section \".idata$5\"\n" ); + output( "\n\t.section .idata$5\n" ); output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ - output( "\n\t.section \".idata$7\"\n" ); + output( "\n\t.section .idata$7\n" ); output( "%s\n", asm_globl( import_name ) ); output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); @@ -1891,10 +1891,10 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc break; } - output( "\n\t.section \".idata$4\"\n" ); + output( "\n\t.section .idata$4\n" ); output_thunk_rva( by_name ? -1 : odp->ordinal, ".L__wine_import_name" ); - output( "\n\t.section \".idata$5\"\n" ); + output( "\n\t.section .idata$5\n" ); output( "%s\n", asm_globl( imp_name ) ); if (is_delay) output( "\t%s .L__wine_delay_import\n", get_asm_ptr_keyword() ); @@ -1903,14 +1903,14 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc if (by_name) { - output( "\n\t.section \".idata$6\"\n" ); + output( "\n\t.section .idata$6\n" ); output( ".L__wine_import_name:\n" ); output( "\t.short %d\n", odp->hint ); output( "\t%s \"%s\"\n", get_asm_string_keyword(), name ); } /* reference head object to always pull its sections */ - output( "\n\t.section \".idata$7\"\n" ); + output( "\n\t.section .idata$7\n" ); output_rva( "%s", asm_name( import_desc ) ); free( imp_name );

1 0

Alexandre Julliard : winebuild: Put the delay import thunk in a separate section.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: wine Branch: master Commit: 1f5c288b4f4c5fc9faadab5e9bbf24cc9e32e64e URL: https://gitlab.winehq.org/wine/wine/-/commit/1f5c288b4f4c5fc9faadab5e9bbf24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 10:05:49 2022 +0100 winebuild: Put the delay import thunk in a separate section. To work around a binutils bug, cf. https://sourceware.org/bugzilla/show_bug.cgi?id=14339 --- tools/winebuild/import.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index dfda228c4ec..ee3c310546b 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1851,6 +1851,7 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\tjmp *%s\n", asm_name( imp_name ) ); if (is_delay) { + output( "\n\t.section .text$1\n" ); output( ".L__wine_delay_import:\n" ); output( "\tmov $%s,%%eax\n", asm_name( imp_name ) ); output( "\tjmp %s\n", asm_name( delay_load ) ); @@ -1860,6 +1861,7 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\tjmp *%s(%%rip)\n", asm_name( imp_name ) ); if (is_delay) { + output( "\n\t.section .text$1\n" ); output( ".L__wine_delay_import:\n" ); output( "\tlea %s(%%rip),%%rax\n", asm_name( imp_name ) ); output( "\tjmp %s\n", asm_name( delay_load ) ); @@ -1870,6 +1872,7 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\tldr PC, [IP]\n" ); if (is_delay) { + output( "\n\t.section .text$1\n" ); output( ".L__wine_delay_import:\n" ); output( "\tldr IP, 1f\n" ); output( "\tldr IP, [IP]\n" ); @@ -1883,6 +1886,7 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\tbr x16\n" ); if (is_delay) { + output( "\n\t.section .text$1\n" ); output( ".L__wine_delay_import:\n" ); output( "\tadrp x16, %s\n", arm64_page( asm_name( imp_name ) ) ); output( "\tadd x16, x16, #%s\n", arm64_pageoff( asm_name( imp_name ) ) );

1 0

Francois Gouget : testbot/TestWTBS: Allow checking the new task counters.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: tools Branch: master Commit: 41f41b29546d13b4c325d273338b880f3b4a141f URL: https://gitlab.winehq.org/winehq/tools/-/commit/41f41b29546d13b4c325d273338… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 3 03:15:51 2022 +0100 testbot/TestWTBS: Allow checking the new task counters. --- testbot/tests/TestWTBS | 103 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 77 insertions(+), 26 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 33074a82..59909287 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -368,7 +368,7 @@ sub LoadTestInfo($) { # Ignore these } - elsif ($Entry !~ /^(?:CurGroup|eCount|eNew|MsgGroups|MsgGroupNames|LineNo|LogName|LogPath)$/) + elsif ($Entry !~ /^(?:CurGroup|eCount|eNew|kCount|kNew|MsgGroups|MsgGroupNames|LineNo|LogName|LogPath)$/) { fail("$FileName: $Entry is not a valid property name"); } @@ -400,6 +400,22 @@ sub LoadTestInfo($) SetDefault($TestInfo, "tasks", "Status", "completed"); SetDefault($TestInfo, "tasks", "HasTask", 1); } + foreach my $TaskType ("tasks", "tests", "build", "win", "win32", "win64", "wine", "wine:build", "wine:test", "wine:module") + { + my $TaskInfo = $TestInfo->{$TaskType}; + if (defined $TaskInfo->{TestFailures}) + { + SetDefault($TestInfo, $TaskType, "NewTestFailures", $TaskInfo->{TestFailures}); + if (CheckValue($TaskInfo->{TestFailures})) + { + SetDefault($TestInfo, $TaskType, "FailedTestUnits", $TaskInfo->{TestFailures} ? 1 : 0); + } + } + if (defined $TaskInfo->{Warnings}) + { + SetDefault($TestInfo, $TaskType, "NewWarnings", $TaskInfo->{Warnings}); + } + } foreach my $BuildType ("build", "wine:build") { next if (!defined $TestInfo->{$BuildType}->{TestUnits}); @@ -913,10 +929,22 @@ still queued or running or have been canceled are automatically skipped to avoid false positives. By default the Status field should be 'completed'. +=item <tasks.NewWarnings> +=item <tasks.Warnings> +=item <tasks.NewTestFailures> =item <tasks.TestFailures> -Checks the value of the task's TestFailures field. -By default the TestFailures field is not checked. +Checks the value of the corresponding task's field. +By default none of these fields are checked. +If Warnings is set and not NewWarnings, then it is assumed it should have the +same value. The same applies to TestFailures and NewTestFailures. + +=item <tasks.FailedTestUnits> + +Checks the value of the corresponding task's field. More precisely: +* FailedTestUnits == undef && TestFailures == undef -> not checked +* FailedTestUnits == undef && TestFailures == 0 -> expect 0 +* FailedTestUnits == undef && TestFailures != 0 -> expect 1 =item <tasks.HasTimeout> @@ -1000,7 +1028,7 @@ sub CheckTask($$$$) my $CheckTimeouts = ($Task->Status eq "completed" and CheckValue($TaskInfo->{HasTimeout})); - my ($ReportFailures, $IgnoreFailures); + my (%Ignore, %Counts); my ($ReportCount, $TimeoutCount, $NewFailures) = (0, 0, 0); foreach my $LogName (@{GetLogFileNames($Task->GetDir())}) { @@ -1028,16 +1056,36 @@ sub CheckTask($$$$) map { $TestUnits->{$MissionType}->{$_} = 1 } (keys %$ReportTestUnits); } - if (CheckValue($MissionInfo->{TestFailures})) + foreach my $Counter ("NewWarnings", "Warnings", "NewTestFailures", "TestFailures") + { + if (CheckValue($MissionInfo->{$Counter})) + { + my $LogCount = $Counter eq "NewWarnings" ? ($LogInfo->{wNew} || 0) - ($LogInfo->{wKnownNew} || 0) : + $Counter eq "Warnings" ? $LogInfo->{wCount} : + $Counter eq "NewFailures" ? ($LogInfo->{eNew} || 0) - ($LogInfo->{eKnownNew} || 0) : + $Counter eq "Failures" ? $LogInfo->{eCount} : + -1; + ok($LogCount <= $MissionInfo->{$Counter}, + "Check $Counter of $LogName in task ". TaskKeyStr($Task)) + or diag("report $Counter count = $LogCount, expected at most $MissionInfo->{$Counter}"); + $Counts{$Counter} += $MissionInfo->{$Counter}; + } + else + { + $Ignore{$Counter} = 1; + } + } + if (CheckValue($MissionInfo->{FailedTestUnits})) { - ok(($LogInfo->{eCount} || 0) <= $MissionInfo->{TestFailures}, - "Check Failures of $LogName in task ". TaskKeyStr($Task)) - or diag("report error count = ", ($LogInfo->{eCount} || 0), ", expected at most $MissionInfo->{TestFailures}"); - $ReportFailures += $MissionInfo->{TestFailures}; + my $LogCount = @{$LogInfo->{FailedTestUnits} || []}; + ok($LogCount == $MissionInfo->{FailedTestUnits}, + "Check FailedTestUnits of $LogName in task ". TaskKeyStr($Task)) + or diag("report FailedTestUnits count = $LogCount expected $MissionInfo->{FailedTestUnits}"); + $Counts{FailedTestUnits} ||= $MissionInfo->{FailedTestUnits}; } else { - $IgnoreFailures = 1; + $Ignore{FailedTestUnits} = 1; } } elsif ($LogName =~ /^testbot\./) @@ -1062,24 +1110,27 @@ sub CheckTask($$$$) } if ($Task->Status eq "completed") { - if ($IsTestTask and ($ReportCount or CheckValue($TaskInfo->{TestUnits}))) + if ($ReportCount) { - if ($IgnoreFailures) - { - # For some mission types (typically test=module) the failure count - # is unpredictable and cannot be checked. - ; # Nothing to do - } - elsif ($ReportCount) - { - # The task's failure count must be compared to the sum of the failure - # counts of each test report. - is($Task->TestFailures, $ReportFailures, "Check Failures of task ". TaskKeyStr($Task)); - } - elsif (CheckValue($TaskInfo->{TestFailures})) + foreach my $Counter ("NewWarnings", "Warnings", "NewTestFailures", "TestFailures", "FailedTestUnits") { - # There is no report if the VM crashed / rebooted - is($Task->TestFailures, $TaskInfo->{TestFailures}, "Check Failures of task ". TaskKeyStr($Task)); + if ($Ignore{$Counter}) + { + # For some mission types (typically test=module) the counter values + # are unpredictable and cannot be checked. + ; # Nothing to do + } + elsif ($ReportCount) + { + # The task's (warning / failure) count must be compared to the sum + # of the counts for each report. + is($Task->$Counter || 0, $Counts{$Counter}, "Check $Counter of task ". TaskKeyStr($Task)); + } + elsif (CheckValue($TaskInfo->{$Counter})) + { + # There is no report if the VM crashed / rebooted + is($Task->$Counter, $TaskInfo->{$Counter}, "Check $Counter of task ". TaskKeyStr($Task)); + } } } elsif (!$IsTestTask and $ReportCount)

1 0

Francois Gouget : testbot/WineRun*: Downgrade an error to an information message.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: tools Branch: master Commit: 0de021aa9a4c1144d66345443330391553d97953 URL: https://gitlab.winehq.org/winehq/tools/-/commit/0de021aa9a4c1144d6634544333… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 25 02:41:54 2022 +0100 testbot/WineRun*: Downgrade an error to an information message. When a task fails to run (e.g. because of a network error) the message indicating it had to be restarted should not be marked as an error as that would imply the patch is responsible for it when it is most likely not. Similarly it should not be a warning ascribed to the patch. So marking this as an information message makes the most sense. Also note that the fact the task had to be restarted will be visible on the job details page by the presence of the 'old testbot logs' link. --- testbot/bin/WineRunBuild.pl | 8 +++++++- testbot/bin/WineRunReconfig.pl | 8 +++++++- testbot/bin/WineRunTask.pl | 8 +++++++- testbot/bin/WineRunWineTest.pl | 8 +++++++- testbot/lib/WineTestBot/LogUtils.pm | 3 ++- 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index eb4b2c7d..64fe45ec 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -175,6 +175,12 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started on ", $VM->Name, "\n"; # Error handling helpers # +sub LogTaskInfo($) +{ + my ($ErrMessage) = @_; + print STDERR "$Name0:info: ", $ErrMessage; +} + sub LogTaskError($) { my ($ErrMessage) = @_; @@ -208,7 +214,7 @@ sub WrapUpAndExit($;$$$$$$$) } elsif ($Tries >= 1) { - LogTaskError("The previous $Tries run(s) terminated abnormally\n"); + LogTaskInfo("The previous $Tries run(s) terminated abnormally\n"); } # Record result details that may be lost or overwritten by a later run diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index dc9f759b..5d58411b 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -176,6 +176,12 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; # Error handling helpers # +sub LogTaskInfo($) +{ + my ($ErrMessage) = @_; + print STDERR "$Name0:info: ", $ErrMessage; +} + sub LogTaskError($) { my ($ErrMessage) = @_; @@ -210,7 +216,7 @@ sub WrapUpAndExit($;$$$$$$$) } elsif ($Tries >= 1) { - LogTaskError("The previous $Tries run(s) terminated abnormally\n"); + LogTaskInfo("The previous $Tries run(s) terminated abnormally\n"); } # Record result details that may be lost or overwritten by a later run diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index bce67cf2..3b514fb1 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -204,6 +204,12 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started on ", $VM->Name, "\n"; # Error handling helpers # +sub LogTaskInfo($) +{ + my ($ErrMessage) = @_; + print STDERR "$Name0:info: ", $ErrMessage; +} + sub LogTaskError($) { my ($ErrMessage) = @_; @@ -242,7 +248,7 @@ sub WrapUpAndExit($;$$$$$$$$) } elsif ($Tries >= 1) { - LogTaskError("The previous $Tries run(s) terminated abnormally\n"); + LogTaskInfo("The previous $Tries run(s) terminated abnormally\n"); } # Record result details that may be lost or overwritten by a later run diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index dd578e47..ad869a96 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -201,6 +201,12 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started on ", $VM->Name, "\n"; # Error handling helpers # +sub LogTaskInfo($) +{ + my ($ErrMessage) = @_; + print STDERR "$Name0:info: ", $ErrMessage; +} + sub LogTaskError($) { my ($ErrMessage) = @_; @@ -239,7 +245,7 @@ sub WrapUpAndExit($;$$$$$$$$) } elsif ($Tries >= 1) { - LogTaskError("The previous $Tries run(s) terminated abnormally\n"); + LogTaskInfo("The previous $Tries run(s) terminated abnormally\n"); } # Record result details that may be lost or overwritten by a later run diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 3aa59391..07b4dcf5 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -91,7 +91,8 @@ sub GetLogLineCategory($) $Line =~ /^Running (?:the tests|WineTest) / or $Line =~ /^Task: (?:ok|tests|Updated)/ or # testbot.log information messages - $Line =~ /^----- Run /) + $Line =~ /^----- Run / or + $Line =~ /:info:/) { return "info"; }

1 0

Francois Gouget : testbot/LogUtils: Remove explicit highlighting of a couple of task messages.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: tools Branch: master Commit: 154bf0482bb327260501cbf8ef21bead9bebda28 URL: https://gitlab.winehq.org/winehq/tools/-/commit/154bf0482bb327260501cbf8ef2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 1 15:57:40 2022 +0100 testbot/LogUtils: Remove explicit highlighting of a couple of task messages. They are now prefixed by the script name and message category (error, warning, etc). --- testbot/lib/WineTestBot/LogUtils.pm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index fc840f97..3aa59391 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -91,9 +91,7 @@ sub GetLogLineCategory($) $Line =~ /^Running (?:the tests|WineTest) / or $Line =~ /^Task: (?:ok|tests|Updated)/ or # testbot.log information messages - $Line =~ /^----- Run / or - $Line =~ /^The test VM has crashed/ or # Context for an error message - $Line =~ /^The previous \d+ run$s$ terminated abnormally/) + $Line =~ /^----- Run /) { return "info"; }

1 0

Francois Gouget : testbot/LogUtils: Track the known new failures and warnings.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: tools Branch: master Commit: d7f66da4f6092ecb26ff40a3111a9208406f1f73 URL: https://gitlab.winehq.org/winehq/tools/-/commit/d7f66da4f6092ecb26ff40a3111… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 3 03:10:54 2022 +0100 testbot/LogUtils: Track the known new failures and warnings. This adds a per-message-type KnownNew counter to the $LogInfo structure which allows callers to quickly discount the new but known failures and warnings. --- testbot/lib/WineTestBot/LogUtils.pm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index c381906d..e4145628 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1047,7 +1047,15 @@ sub LoadLogErrorsFromFh($$) } elsif ($Type eq "f") { - $LogInfo->{CurGroup}->{Failures}->{$Property} = [ split / /, $Value ]; + my $MsgIndex = $Property; + my $CurGroup = $LogInfo->{CurGroup}; + $CurGroup->{Failures}->{$Property} = [ split / /, $Value ]; + if ($CurGroup->{IsNew}->[$MsgIndex]) + { + my $Type = $CurGroup->{Types}->[$MsgIndex]; + $CurGroup->{"${Type}KnownNew"}++; + $LogInfo->{"${Type}KnownNew"}++; + } } else { @@ -1514,6 +1522,12 @@ sub MatchLogFailures($$) my $LineFailures = $Group->{Failures}->{$MsgIndex} ||= []; push @$LineFailures, $UnitFailure->Id; + if ($Group->{IsNew}->[$MsgIndex]) + { + my $Type = $Group->{Types}->[$MsgIndex]; + $Group->{"${Type}KnownNew"}++; + $LogInfo->{"${Type}KnownNew"}++; + } my $LogFailure = $LogFailures->{Failures}->{$UnitFailure->Id}; if (!$LogFailure)

1 0

Francois Gouget : testbot/orm: Fix a minor formatting issues.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: tools Branch: master Commit: 1e840275b5d08e4b0fb15541e5dfa8f80489fc4b URL: https://gitlab.winehq.org/winehq/tools/-/commit/1e840275b5d08e4b0fb15541e5d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 30 16:21:30 2022 +0100 testbot/orm: Fix a minor formatting issues. --- testbot/lib/ObjectModel/Collection.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 9dcaf33d..222c26a1 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -894,7 +894,7 @@ sub PrepareFilter($$) sub AddFilter($$;$$) { my $self = shift; - my $Filter =@_ == 1 ? $_[0] : FilterValue($_[0], $_[2] || "=", $_[1]); + my $Filter = @_ == 1 ? $_[0] : FilterValue($_[0], $_[2] || "=", $_[1]); $self->PrepareFilter($Filter); if (!$self->{Filter})

1 0

Francois Gouget : testbot: Add Task fields to track warnings, failures and bad test units.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: tools Branch: master Commit: cc2b971a9c02838154cf94171e539a846133faf7 URL: https://gitlab.winehq.org/winehq/tools/-/commit/cc2b971a9c02838154cf94171e5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 28 02:56:25 2022 +0200 testbot: Add Task fields to track warnings, failures and bad test units. So far the tasks have a TestFailures field which tracks the number of failures for that task, but not whether any of them is new. This adds a field to keep track of the number of new failures and another pair to do the same for warnings. This further adds a field to track the numbder of failed test units. These fields can then be used in the web pages to indicate whether there are new failures / warnings, and how many test units have failed. But until there is support for setting these fields, they are hidden. --- testbot/bin/Engine.pl | 4 ++++ testbot/ddl/update48.sql | 11 +++++++++++ testbot/ddl/winetestbot.sql | 4 ++++ testbot/lib/WineTestBot/Jobs.pm | 4 ++++ testbot/lib/WineTestBot/StepsTasks.pm | 8 ++++++++ testbot/lib/WineTestBot/Tasks.pm | 4 ++++ testbot/web/JobDetails.pl | 2 +- 7 files changed, 36 insertions(+), 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 39577d14..d51adcb4 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -147,7 +147,11 @@ sub Cleanup($;$$) $Task->Status("queued"); $Task->Started(undef); $Task->Ended(undef); + $Task->NewWarnings(undef); + $Task->Warnings(undef); + $Task->NewTestFailures(undef); $Task->TestFailures(undef); + $Task->FailedTestUnits(undef); $Task->Save(); $CallUpdateStatus = 1; } diff --git a/testbot/ddl/update48.sql b/testbot/ddl/update48.sql new file mode 100644 index 00000000..79b14d06 --- /dev/null +++ b/testbot/ddl/update48.sql @@ -0,0 +1,11 @@ +USE winetestbot; + +ALTER TABLE Tasks + ADD NewWarnings INT(6) NULL + AFTER Ended, + ADD Warnings INT(6) NULL + AFTER NewWarnings, + ADD NewTestFailures INT(6) NULL + AFTER Warnings, + ADD FailedTestUnits INT(6) NULL + AFTER TestFailures; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 0cf70484..3c4f32a0 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -158,7 +158,11 @@ CREATE TABLE Tasks CmdLineArg VARCHAR(256) NULL, Started DATETIME NULL, Ended DATETIME NULL, + NewWarnings INT(6) NULL, + Warnings INT(6) NULL, + NewTestFailures INT(6) NULL, TestFailures INT(6) NULL, + FailedTestUnits INT(6) NULL, PRIMARY KEY (JobId, StepNo, No), FOREIGN KEY(VMName) REFERENCES VMs(Name) ) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index b54f864d..c5becbef 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -412,7 +412,11 @@ sub Restart($) $Task->Status("queued"); $Task->Started(undef); $Task->Ended(undef); + $Task->NewWarnings(undef); + $Task->Warnings(undef); + $Task->NewTestFailures(undef); $Task->TestFailures(undef); + $Task->FailedTestUnits(undef); } $Step->Status("queued"); $Step->RmTree(); diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 87146b27..928d33a4 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -157,7 +157,11 @@ sub _initialize($$) $StepTask->CmdLineArg($Task->CmdLineArg); $StepTask->Started($Task->Started); $StepTask->Ended($Task->Ended); + $StepTask->NewWarnings($Task->NewWarnings); + $StepTask->Warnings($Task->Warnings); + $StepTask->NewTestFailures($Task->NewTestFailures); $StepTask->TestFailures($Task->TestFailures); + $StepTask->FailedTestUnits($Task->FailedTestUnits); $self->{Items}{$StepTask->GetKey()} = $StepTask; } @@ -190,7 +194,11 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), CreateBasicPropertyDescriptor("Started", "Started", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), + CreateBasicPropertyDescriptor("NewWarnings", "New Warnings", !1, !1, "N", 6), + CreateBasicPropertyDescriptor("Warnings", "Warnings", !1, !1, "N", 6), + CreateBasicPropertyDescriptor("NewTestFailures", "New Failures", !1, !1, "N", 6), CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), + CreateBasicPropertyDescriptor("FailedTestUnits", "Bad Test Units", !1, !1, "N", 6), ); SetupItemrefColumns(\@PropertyDescriptors); diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 5b87c782..b6332d2d 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -363,7 +363,11 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), CreateBasicPropertyDescriptor("Started", "Started", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), + CreateBasicPropertyDescriptor("NewWarnings", "New Warnings", !1, !1, "N", 6), + CreateBasicPropertyDescriptor("Warnings", "Warnings", !1, !1, "N", 6), + CreateBasicPropertyDescriptor("NewTestFailures", "New Failures", !1, !1, "N", 6), CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), + CreateBasicPropertyDescriptor("FailedTestUnits", "Bad Test Units", !1, !1, "N", 6), CreateDetailrefPropertyDescriptor("Failures", "Known failures", \&CreateTaskFailures), ); SetupItemrefColumns(\@PropertyDescriptors); diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 0b42aea5..035cba8c 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -50,7 +50,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:Id|PreviousNo|Type|VM|FileType|Missions)$/ ? "" : + return $PropertyName =~ /^(?:Id|PreviousNo|Type|VM|FileType|Missions|NewWarnings|Warnings|NewTestFailures|FailedTestUnits)$/ ? "" : $PropertyName eq "Started" ? ("ro", "timetipdate") : $self->SUPER::DisplayProperty($PropertyDescriptor); }

1 0

Francois Gouget : testbot: Track and count the bad test units.
by Alexandre Julliard Dec. 7, 2022

Dec. 7, 2022

Module: tools Branch: master Commit: c6b58b0f635a5066d89ebf6eede5d9fae76dcfce URL: https://gitlab.winehq.org/winehq/tools/-/commit/c6b58b0f635a5066d89ebf6eede… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 7 19:45:32 2022 +0100 testbot: Track and count the bad test units. Build a list of test units that have failures in a given report and save that information in the .errors file. Count the deduplicated bad test units and set the task's FailedTestUnits field accordingly. --- testbot/bin/WineRunTask.pl | 10 ++++++---- testbot/bin/WineRunWineTest.pl | 10 ++++++---- testbot/lib/WineTestBot/LogUtils.pm | 34 +++++++++++++++++++++++++++++++--- 3 files changed, 43 insertions(+), 11 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 73908305..bce67cf2 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -212,9 +212,9 @@ sub LogTaskError($) my $ReportNames; -sub WrapUpAndExit($;$$$$$$$) +sub WrapUpAndExit($;$$$$$$$$) { - my ($Status, $TestFailures, $Retry, $TimedOut, $Reason, $NewTestFailures, $NewWarnings, $Warnings) = @_; + my ($Status, $TestFailures, $Retry, $TimedOut, $Reason, $NewTestFailures, $NewWarnings, $Warnings, $FailedTestUnits) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; my $VMResult = $Reason ? $Reason : $Status eq "boterror" ? "boterror" : @@ -258,6 +258,7 @@ sub WrapUpAndExit($;$$$$$$$) $Task->Warnings($Warnings); $Task->NewTestFailures($NewTestFailures); $Task->TestFailures($TestFailures); + $Task->FailedTestUnits($FailedTestUnits); if ($Status eq 'queued') { $Task->Started(undef); @@ -515,7 +516,7 @@ if (!$Pid) my $NewStatus = 'completed'; my ($TaskFailures, $TaskTimedOut, $TAError, $PossibleCrash); -my ($NewTestFailures, $NewWarnings, $Warnings); +my ($NewTestFailures, $NewWarnings, $Warnings, $FailedTestUnits); Debug(Elapsed($Start), " Waiting for the script (", $Timeout, "s timeout)\n"); if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) { @@ -580,6 +581,7 @@ if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) { $NewWarnings = ($LogInfo->{wNew} || 0) - ($LogInfo->{wKnownNew} || 0); } + map { $FailedTestUnits->{$_} = 1 } @{$LogInfo->{FailedTestUnits}}; } } elsif (!defined $TAError) @@ -597,4 +599,4 @@ $TA->Disconnect(); FatalTAError(undef, $TAError, $PossibleCrash) if (defined $TAError); -WrapUpAndExit($NewStatus, $TaskFailures, undef, $TaskTimedOut, undef, $NewTestFailures, $NewWarnings, $Warnings); +WrapUpAndExit($NewStatus, $TaskFailures, undef, $TaskTimedOut, undef, $NewTestFailures, $NewWarnings, $Warnings, $FailedTestUnits ? scalar(%$FailedTestUnits) : undef); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index c2dccf29..dd578e47 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -209,9 +209,9 @@ sub LogTaskError($) my $ReportNames; -sub WrapUpAndExit($;$$$$$$$) +sub WrapUpAndExit($;$$$$$$$$) { - my ($Status, $TestFailures, $Retry, $TimedOut, $Reason, $NewTestFailures, $NewWarnings, $Warnings) = @_; + my ($Status, $TestFailures, $Retry, $TimedOut, $Reason, $NewTestFailures, $NewWarnings, $Warnings, $FailedTestUnits) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; my $VMResult = defined $Reason ? $Reason : $Status eq "boterror" ? "boterror" : @@ -255,6 +255,7 @@ sub WrapUpAndExit($;$$$$$$$) $Task->Warnings($Warnings); $Task->NewTestFailures($NewTestFailures); $Task->TestFailures($TestFailures); + $Task->FailedTestUnits($FailedTestUnits); if ($Status eq 'queued') { $Task->Started(undef); @@ -486,7 +487,7 @@ if (!$Pid) my $NewStatus = 'completed'; my ($ErrMessage, $TaskFailures, $TaskTimedOut, $TAError, $PossibleCrash); -my ($NewTestFailures, $NewWarnings, $Warnings); +my ($NewTestFailures, $NewWarnings, $Warnings, $FailedTestUnits); Debug(Elapsed($Start), " Waiting for the script (", $Task->Timeout, "s timeout)\n"); if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) { @@ -613,6 +614,7 @@ foreach my $RptFileName (@$ReportNames) $NewWarnings += ($LogInfo->{wNew} || 0) - ($LogInfo->{wKnownNew} || 0); } } + map { $FailedTestUnits->{$_} = 1 } @{$LogInfo->{FailedTestUnits}}; } elsif (!defined $TAError and $TA->GetLastError() !~ /: No such file or directory/) @@ -635,4 +637,4 @@ $TA->Disconnect(); LogTaskError($ErrMessage) if (defined $ErrMessage); FatalTAError(undef, $TAError, $PossibleCrash) if (defined $TAError); -WrapUpAndExit($NewStatus, $TaskFailures, undef, $TaskTimedOut, undef, $NewTestFailures, $NewWarnings, $Warnings); +WrapUpAndExit($NewStatus, $TaskFailures, undef, $TaskTimedOut, undef, $NewTestFailures, $NewWarnings, $Warnings, $FailedTestUnits ? scalar(%$FailedTestUnits) : undef); diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e4145628..fc840f97 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -422,7 +422,11 @@ sub _AddExtra($$;$) { my ($LogInfo, $Error, $Cur) = @_; - $Error = "$Cur->{Dll}:$Cur->{Unit} $Error" if (defined $Cur); + if (defined $Cur) + { + $Error = "$Cur->{Dll}:$Cur->{Unit} $Error"; + $Cur->{Extra}++; + } push @{$LogInfo->{Extra}}, $Error; } @@ -513,6 +517,12 @@ sub _CloseTestUnit($$$) } } } + if ($Cur->{Dll} and + ($Cur->{Rc} or $Cur->{Extra} or $Cur->{LineFailures} or + $Cur->{SummaryFailures} or $Cur->{LineFlaky} or $Cur->{SummaryFlaky})) + { + $LogInfo->{_FailedTestUnits}->{"$Cur->{Dll}:$Cur->{Unit}"} = 1; + } } sub _AddReportMsg($$$$$) @@ -555,6 +565,9 @@ The number of test units. =item TimeoutCount The number of test units that timed out. +=item FailedTestUnits +A list of test units that have failures (flaky or not). + =item eCount, eNew, MsgGroupNames, MsgGroups, BadLog See ParseTaskLog() for details. @@ -575,6 +588,7 @@ sub ParseWineTestReport($$$) TestUnitCount => 0, TimeoutCount => 0, + FailedTestUnits => [], MsgGroupNames => [], MsgGroups => {}, @@ -795,12 +809,12 @@ sub ParseWineTestReport($$$) # The main summary line is missing if ($Rc & 0xc0000000) { - _AddExtra($LogInfo, sprintf("%s:%s crashed (%08x)", $Dll, $Unit, $Rc & 0xffffffff)); + _AddExtra($LogInfo, sprintf("crashed (%08x)", $Rc & 0xffffffff), $Cur); $Cur->{IsBroken} = 1; } elsif ($LogInfo->{IsWineTest} and !$Cur->{IsBroken}) { - _AddExtra($LogInfo, "$Dll:$Unit has no test summary line (early exit of the main process?)"); + _AddExtra($LogInfo, "has no test summary line (early exit of the main process?)", $Cur); } } elsif ($Rc & 0xc0000000) @@ -817,6 +831,7 @@ sub ParseWineTestReport($$$) $Cur->{IsBroken} = 1 if ($LogInfo->{TaskTimedOut}); _CloseTestUnit($LogInfo, $Cur, 1); close($LogFile); + $LogInfo->{FailedTestUnits} = [ sort keys %{$LogInfo->{_FailedTestUnits}} ]; # Move the extra errors into their own error group my $ExtraCount = @{$LogInfo->{Extra}}; @@ -1124,11 +1139,24 @@ sub _WriteLogErrorsToFh($$) { my ($Fh, $LogInfo) = @_; + # Save some properties... foreach my $Name ("BadRef", "NoRef") { next if (!defined $LogInfo->{$Name}); print $Fh "p $Name $LogInfo->{$Name}\n"; } + + # some arrays... + foreach my $Name ("FailedTestUnits") + { + next if (!defined $LogInfo->{$Name}); + foreach my $Value (@{$LogInfo->{$Name}}) + { + print $Fh "a $Name $Value\n"; + } + } + + # and the message groups + known failures foreach my $GroupName (@{$LogInfo->{MsgGroupNames}}) { my $Group = $LogInfo->{MsgGroups}->{$GroupName};

1 0