June 2018 - Wine-commits - list.winehq.org

Francois Gouget : testbot/WineRunTask: Keep the old reference report if the new one is missing.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: tools Branch: master Commit: 4737be4cefd50cd483925731a9a79611a05b3314 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4737be4cefd50cd48392573… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 21 14:32:08 2018 +0200 testbot/WineRunTask: Keep the old reference report if the new one is missing. The WineTest results usually don't change too much from one run to the next so it's better to have a slightly out of date report than nothing at all. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index c4ca578..ed19034 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -291,13 +291,20 @@ sub WrapUpAndExit($;$$$) if ($Status eq 'completed' and $Step->Type eq 'suite') { - # Update the reference VM suite results for WineSendLog.pl - my $LatestBaseName = join("", "$DataDir/latest/", $Task->VM->Name, "_", - $Step->FileType eq "exe64" ? "64" : "32"); - unlink("$LatestBaseName.log"); - link("$TaskDir/log", "$LatestBaseName.log") if (-f "$TaskDir/log"); - unlink("$LatestBaseName.err"); - link("$TaskDir/err", "$LatestBaseName.err") if (-f "$TaskDir/err"); + # Keep the old report if the new one is missing + if (-f "$TaskDir/log" and !-z "$TaskDir/log") + { + # Update the reference VM suite results for WineSendLog.pl + my $LatestBaseName = join("", "$DataDir/latest/", $Task->VM->Name, "_", + $Step->FileType eq "exe64" ? "64" : "32"); + unlink("$LatestBaseName.log"); + link("$TaskDir/log", "$LatestBaseName.log"); + unlink("$LatestBaseName.err"); + if (-f "$TaskDir/err" and !-z "$TaskDir/err") + { + link("$TaskDir/err", "$LatestBaseName.err"); + } + } } my $Result = $VM->Name .": ". $VM->Status ." Status: $Status Failures: ". (defined $TestFailures ? $TestFailures : "unset");

1 0

Francois Gouget : testbot/WineRunTask: Preserve the old WineTest report in case of timeout.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: tools Branch: master Commit: 8c0549a75712141c92be90a6cc92a6e8d8b8e1bb URL: https://source.winehq.org/git/tools.git/?a=commit;h=8c0549a75712141c92be90a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 21 14:32:23 2018 +0200 testbot/WineRunTask: Preserve the old WineTest report in case of timeout. If the task timed out the new report is likely quite incomplete and thus would be a poor substitute for the existing reference WineTest report. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index ed19034..7f92b88 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -289,7 +289,7 @@ sub WrapUpAndExit($;$$$) $VM->Save(); } - if ($Status eq 'completed' and $Step->Type eq 'suite') + if ($Step->Type eq 'suite' and $Status eq 'completed' and !$TimedOut) { # Keep the old report if the new one is missing if (-f "$TaskDir/log" and !-z "$TaskDir/log")

1 0

Francois Gouget : testbot/WineRunTask: Rename the Windows test reports.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: tools Branch: master Commit: 380f273d7b48561c6b41c8583f55083246bb1728 URL: https://source.winehq.org/git/tools.git/?a=commit;h=380f273d7b48561c6b41c85… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 21 14:35:29 2018 +0200 testbot/WineRunTask: Rename the Windows test reports. Keep 'log' for the task log messages (such as the compilation log) and store the actual (WineTest) test report in '.report' files. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 16 ++++++++-------- testbot/web/JobDetails.pl | 9 ++++++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 7f92b88..3f5a3ee 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -195,7 +195,7 @@ my $OldUMask = umask(002); my $TaskDir = $Task->CreateDir(); umask($OldUMask); my $VM = $Task->VM; -my $RptFileName = $VM->Name . ".rpt"; +my $RptFileName = $Step->FileType .".report"; my $Start = Time(); @@ -292,13 +292,13 @@ sub WrapUpAndExit($;$$$) if ($Step->Type eq 'suite' and $Status eq 'completed' and !$TimedOut) { # Keep the old report if the new one is missing - if (-f "$TaskDir/log" and !-z "$TaskDir/log") + if (-f "$TaskDir/$RptFileName" and !-z "$TaskDir/$RptFileName") { # Update the reference VM suite results for WineSendLog.pl my $LatestBaseName = join("", "$DataDir/latest/", $Task->VM->Name, "_", $Step->FileType eq "exe64" ? "64" : "32"); unlink("$LatestBaseName.log"); - link("$TaskDir/log", "$LatestBaseName.log"); + link("$TaskDir/$RptFileName", "$LatestBaseName.log"); unlink("$LatestBaseName.err"); if (-f "$TaskDir/err" and !-z "$TaskDir/err") { @@ -518,11 +518,11 @@ if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) } my $TimedOut; -Debug(Elapsed($Start), " Retrieving the report file to 'log'\n"); -if ($TA->GetFile($RptFileName, "$TaskDir/log")) +Debug(Elapsed($Start), " Retrieving the report file to '$RptFileName'\n"); +if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) { - chmod 0664, "$TaskDir/log"; - if (open(my $LogFile, "<", "$TaskDir/log")) + chmod 0664, "$TaskDir/$RptFileName"; + if (open(my $LogFile, "<", "$TaskDir/$RptFileName")) { # There is more than one test unit when running the full test suite so keep # track of the current one. Note that for the TestBot we don't count or @@ -788,7 +788,7 @@ if ($TA->GetFile($RptFileName, "$TaskDir/log")) else { $NewStatus = 'boterror'; - Error "Unable to open 'log' for reading: $!\n"; + Error "Unable to open '$RptFileName' for reading: $!\n"; LogTaskError("Unable to open the log file for reading: $!\n"); } } diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 410d186..f05c0f6 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -283,9 +283,12 @@ sub GetHtmlLine($$$) return (undef, $Line); } +my @MILogFiles = qw(exe32.report exe64.report log log.old); my %MILogLabels = ( - "log" => "task log", - "log.old" => "old logs", + "exe32.report" => "32 bit Windows report", + "exe64.report" => "64 bit Windows report", + "log" => "task log", + "log.old" => "old logs", ); sub InitMoreInfo($) @@ -301,7 +304,7 @@ sub InitMoreInfo($) my $Value = $self->GetParam("f$Key"); my $TaskDir = $StepTask->GetTaskDir(); - foreach my $Log ("log", "log.old") + foreach my $Log (@MILogFiles) { if (!-f "$TaskDir/$Log" or -z "$TaskDir/$Log") {

1 0

Francois Gouget : testbot/build: Quote the paths in the shell commands.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: tools Branch: master Commit: 96961eb78702428fa9959b0cc316c25abf1e0a58 URL: https://source.winehq.org/git/tools.git/?a=commit;h=96961eb78702428fa9959b0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 21 14:43:28 2018 +0200 testbot/build: Quote the paths in the shell commands. Also check that $DataDir does not contain single quotes, thus ensuring our simple quoting scheme works. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 16 +++++++++++----- testbot/bin/build/Reconfig.pl | 17 +++++++++++------ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index c23bb87..17ae74f 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -82,7 +82,7 @@ sub ApplyPatch($) my ($PatchFile) = @_; InfoMsg "Applying patch\n"; - system("cd $DataDir/wine && set -x && ". + system("cd '$DataDir/wine' && set -x && ". "git apply --verbose ". ShQuote($PatchFile) ." && ". "git add -A"); if ($? != 0) @@ -95,7 +95,7 @@ sub ApplyPatch($) if ($Impacts->{Makefiles}) { InfoMsg "\nRunning make_makefiles\n"; - system("cd $DataDir/wine && set -x && ./tools/make_makefiles"); + system("cd '$DataDir/wine' && set -x && ./tools/make_makefiles"); if ($? != 0) { LogMsg "make_makefiles failed\n"; @@ -106,7 +106,7 @@ sub ApplyPatch($) if ($Impacts->{Autoconf} && !$Impacts->{HasConfigure}) { InfoMsg "\nRunning autoconf\n"; - system("cd $DataDir/wine && set -x && autoconf"); + system("cd '$DataDir/wine' && set -x && autoconf"); if ($? != 0) { LogMsg "Autoconf failed\n"; @@ -122,7 +122,7 @@ sub BuildNative() mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); InfoMsg "\nRebuilding native tools\n"; - system("cd $DataDir/build-native && set -x && ". + system("cd '$DataDir/build-native' && set -x && ". "time make -j$ncpus __tooldeps__"); if ($? != 0) { @@ -147,7 +147,7 @@ sub BuildTestExecutables($$) } InfoMsg "\nBuilding the $Bits-bit test executable(s)\n"; - system("cd $DataDir/build-mingw$Bits && set -x && ". + system("cd '$DataDir/build-mingw$Bits' && set -x && ". "time make -j$ncpus ". join(" ", sort @BuildDirs)); if ($? != 0) { @@ -226,6 +226,12 @@ else FatalError "Invalid number of bits $BitIndicators\n"; } +if ($DataDir =~ /'/) +{ + LogMsg "The install path contains invalid characters\n"; + exit(1); +} + my $Impacts = ApplyPatch($PatchFile); exit(1) if (!$Impacts); diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 2da2f54..5ecbc2a 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -73,7 +73,7 @@ sub BuildTestAgentd() if (! -x "$BinDir/build/testagentd") { InfoMsg "\nBuilding the native testagentd\n"; - system("cd $::RootDir/src/testagentd && set -x && ". + system("cd '$::RootDir/src/testagentd' && set -x && ". "time make -j$ncpus build"); if ($? != 0) { @@ -83,7 +83,7 @@ sub BuildTestAgentd() } InfoMsg "\nRebuilding the Windows TestAgentd\n"; - system("cd $::RootDir/src/testagentd && set -x && ". + system("cd '$::RootDir/src/testagentd' && set -x && ". "time make -j$ncpus iso"); if ($? != 0) { @@ -97,7 +97,7 @@ sub BuildTestAgentd() sub BuildTestLauncher() { InfoMsg "\nRebuilding TestLauncher\n"; - system("cd $::RootDir/src/TestLauncher && set -x && ". + system("cd '$::RootDir/src/TestLauncher' && set -x && ". "time make -j$ncpus"); if ($? != 0) { @@ -111,7 +111,7 @@ sub BuildTestLauncher() sub GitPull() { InfoMsg "\nUpdating the Wine source\n"; - system("cd $DataDir/wine && git pull"); + system("cd '$DataDir/wine' && git pull"); if ($? != 0) { LogMsg "Git pull failed\n"; @@ -134,7 +134,7 @@ sub BuildNative() # Rebuild from scratch to make sure cruft will not accumulate InfoMsg "\nRebuilding native tools\n"; - system("cd $DataDir/build-native && set -x && ". + system("cd '$DataDir/build-native' && set -x && ". "rm -rf * && ". "time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && ". "time make -j$ncpus __tooldeps__"); @@ -157,7 +157,7 @@ sub BuildCross($) # Rebuild from scratch to make sure cruft will not accumulate InfoMsg "\nRebuilding the $Bits-bit test executables\n"; - system("cd $DataDir/build-mingw$Bits && set -x && ". + system("cd '$DataDir/build-mingw$Bits' && set -x && ". "rm -rf * && ". "time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype --disable-winetest && ". "time make -j$ncpus buildtests"); @@ -173,6 +173,11 @@ sub BuildCross($) $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; +if ($DataDir =~ /'/) +{ + LogMsg "The install path contains invalid characters\n"; + exit(1); +} if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging") { LogMsg "Unable to create '$DataDir/staging': $!\n";

1 0

Francois Gouget : testbot/build: Add proper command line options to Build.pl and Reconfig.pl.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: tools Branch: master Commit: 5094b6cd318d40c536937342f0c9bacf8a95111c URL: https://source.winehq.org/git/tools.git/?a=commit;h=5094b6cd318d40c53693734… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 21 14:45:20 2018 +0200 testbot/build: Add proper command line options to Build.pl and Reconfig.pl. This makes it much easier to test the scripts directly on the VM. This also makes it possible to test one aspect of the scripts without having to go through the whole process. In particular the --no-rm Reconfig.pl option speeds up testing by avoiding rebuilding from scratch. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 175 ++++++++++++++++++++++++++++-------------- testbot/bin/build/Reconfig.pl | 137 +++++++++++++++++++++++++++++---- 2 files changed, 241 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=5094b6cd318d40c5369…

1 0

Francois Gouget : testbot/web: Better present the logs and task errors.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: tools Branch: master Commit: 35ecd73ee076e4a8c6228b6efeb8e4789995d718 URL: https://source.winehq.org/git/tools.git/?a=commit;h=35ecd73ee076e4a8c6228b6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 21 14:23:54 2018 +0200 testbot/web: Better present the logs and task errors. Add a horizontal ruler so the log / test report is always clearly separated from the task error messages. Avoid duplicating the code that shows the task errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 152 ++++++++++++++++++++-------------------------- 1 file changed, 67 insertions(+), 85 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 3add52b..1536e87 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -408,127 +408,109 @@ sub GenerateBody($) my $LogName = $MoreInfo->{Full} || $MoreInfo->{Logs}->[0] || "log"; my $ErrName = $LogName eq "log.old" ? "err.old" : "err"; - if (open LOGFILE, "<", "$TaskDir/$LogName") + my ($EmptyDiag, $LogFirst); + if (open(my $LogFile, "<", "$TaskDir/$LogName")) { - my $HasLogEntries = !1; - my $First = 1; + my $HasLogEntries; my $CurrentDll = ""; my $PrintedDll = ""; - my $Line; - while (defined($Line = <LOGFILE>)) + $LogFirst = 1; + foreach my $Line (<$LogFile>) { $HasLogEntries = 1; - chomp($Line); + chomp $Line; if ($Line =~ m/^([^:]+):[^ ]+ start [^ ]+ -\s*$/) { $CurrentDll = $1; } my ($Highlight, $Plain) = $self->GetHtmlLine($MoreInfo->{Full}, $Line); - if ($MoreInfo->{Full} || defined $Highlight) + next if (!$MoreInfo->{Full} and !defined $Highlight); + + if ($PrintedDll ne $CurrentDll && !$MoreInfo->{Full}) + { + print "</code></pre>" if (!$LogFirst); + print "<div class='LogDllName'>$CurrentDll:</div><pre><code>"; + $PrintedDll = $CurrentDll; + $LogFirst = 0; + } + elsif ($LogFirst) + { + print "<pre><code>"; + $LogFirst = 0; + } + if (!$MoreInfo->{Full} && $Line =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) + { + my $Unit = $1 ne "" ? "$1: " : ""; + print "${Unit}Timeout\n"; + } + else { - if ($PrintedDll ne $CurrentDll && !$MoreInfo->{Full}) - { - if ($First) - { - $First = !1; - } - else - { - print "</code></pre>"; - } - print "<div class='LogDllName'>$CurrentDll:</div><pre><code>"; - $PrintedDll = $CurrentDll; - } - elsif ($First) - { - print "<pre><code>"; - $First = !1; - } - if (!$MoreInfo->{Full} && $Line =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) - { - my $Unit = $1 ne "" ? "$1: " : ""; - print "${Unit}Timeout\n"; - } - else - { - print(($Highlight || $Plain), "\n"); - } + print(($Highlight || $Plain), "\n"); } } - close LOGFILE; + close($LogFile); - if (open ERRFILE, "<", "$TaskDir/$ErrName") + if (!$LogFirst) { - $CurrentDll = "*err*"; - while (defined($Line = <ERRFILE>)) + print "</code></pre>\n"; + } + elsif ($HasLogEntries) + { + # Here we know we did not show the full log since it was not empty, + # and yet we did not show anything to the user. But don't claim there + # is no failure if the error log is not empty. + if (-z "$TaskDir/$ErrName") { - $HasLogEntries = 1; - chomp($Line); - if ($PrintedDll ne $CurrentDll) - { - if ($First) - { - $First = !1; - } - else - { - print "</code></pre>\n"; - } - print "<br><pre><code>"; - $PrintedDll = $CurrentDll; - } - print $self->escapeHTML($Line), "\n"; + print "No ". ($StepTask->Type eq "single" || + $StepTask->Type eq "suite" ? "test" : "build") . + " failures found"; + $LogFirst = 0; } - close ERRFILE; } - - if (! $First) + elsif ($StepTask->Status eq "canceled") { - print "</code></pre>\n"; + $EmptyDiag = "<p>No log, task was canceled</p>\n"; + } + elsif ($StepTask->Status eq "skipped") + { + $EmptyDiag = "<p>No log, task skipped</p>\n"; } else { - print $HasLogEntries ? "No " . - ($StepTask->Type eq "single" || - $StepTask->Type eq "suite" ? "test" : "build") . - " failures found" : "Empty log"; + print "Empty log"; + $LogFirst = 0; } } - elsif (open ERRFILE, "<", "$TaskDir/$ErrName") + else + { + print "No log". ($StepTask->Status =~ /^(?:queued|running)$/ ? " yet" : ""); + $LogFirst = 0; + } + + if (open(my $ErrFile, "<", "$TaskDir/$ErrName")) { - my $HasErrEntries = !1; - my $Line; - while (defined($Line = <ERRFILE>)) + my $ErrFirst = 1; + foreach my $Line (<$ErrFile>) { - chomp($Line); - if (! $HasErrEntries) + chomp $Line; + if ($ErrFirst) { + print "<hr>\n" if (!$LogFirst); print "<pre><code>"; - $HasErrEntries = 1; + $ErrFirst = 0; } print $self->escapeHTML($Line), "\n"; } - if ($HasErrEntries) + close($ErrFile); + + if (!$ErrFirst) { print "</code></pre>\n"; } - else + elsif (defined $EmptyDiag) { - print "Empty log"; + print $EmptyDiag; } - close ERRFILE; - } - elsif ($StepTask->Status eq "canceled") - { - print "<p>No log, task was canceled</p>\n"; - } - elsif ($StepTask->Status eq "skipped") - { - print "<p>No log, task skipped</p>\n"; - } - else - { - print "<p>No log available yet</p>\n"; } } print "</div>\n";

1 0

Francois Gouget : testbot/web: Prettify the log / error separator.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: tools Branch: master Commit: 9b27edb137dca80c284874f4dfbed7a758bec9a9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9b27edb137dca80c284874f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 21 14:23:58 2018 +0200 testbot/web: Prettify the log / error separator. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 7 ++++++- testbot/web/WineTestBot.css | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 1536e87..8cc354e 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -495,7 +495,12 @@ sub GenerateBody($) chomp $Line; if ($ErrFirst) { - print "<hr>\n" if (!$LogFirst); + if (!$LogFirst) + { + print "<div class='HrTitle'>". + ($ErrName eq "err" ? "Other errors" : "Old errors") . + "<div class='HrLine'></div></div>\n"; + } print "<pre><code>"; $ErrFirst = 0; } diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 28ac1b1..593c38f 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -317,6 +317,20 @@ h2 padding-bottom: 0.1em; } +.HrTitle { + margin-top: 0.5em; + display: flex; + align-items: center; + color: #a50d0d; +} + +.HrLine { + border-top: 1px solid grey; + flex-grow: 1; + margin: 0 10px; + border-color: #a50d0d; +} + details { font-style: italic;

1 0

Francois Gouget : testbot/web: Detect and highlight some more Git errors.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: tools Branch: master Commit: d993054560052b5a1e146a5971ea24d975ed8ace URL: https://source.winehq.org/git/tools.git/?a=commit;h=d993054560052b5a1e146a5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 21 14:25:08 2018 +0200 testbot/web: Detect and highlight some more Git errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 8cc354e..410d186 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -253,9 +253,12 @@ sub GetHtmlLine($$$) $Line =~ / done $258$/ or $Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or $Line =~ /^Unhandled exception: / or + # Git errors + $Line =~ /^CONFLICT / or + $Line =~ /^error: patch failed:/ or + $Line =~ /^error: corrupt patch / or # Build errors $Line =~ /: error: / or - $Line =~ /^error: patch failed:/ or $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or # Typical perl errors

1 0

Francois Gouget : testbot: VMs::FilterHypervisors() is not used anymore so remove it.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: tools Branch: master Commit: eb2eeb7f6afb65e2efd34bf17e20bb6308a7c673 URL: https://source.winehq.org/git/tools.git/?a=commit;h=eb2eeb7f6afb65e2efd34bf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 21 14:25:39 2018 +0200 testbot: VMs::FilterHypervisors() is not used anymore so remove it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index a29eebb..2f494cb 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -730,11 +730,4 @@ sub FilterEnabledStatus($) $self->AddFilter("Status", ["dirty", "reverting", "sleeping", "idle", "running", "off", "offline"]); } -sub FilterHypervisors($$) -{ - my ($self, $Hypervisors) = @_; - - $self->AddFilter("VirtURI", $Hypervisors); -} - 1;

1 0

Józef Kucia : vulkan-1/tests: Add tests.
by Alexandre Julliard 22 Jun '18

22 Jun '18

Module: wine Branch: master Commit: 4a332a7692ce67ca1cd287f16a50e64f1d0376b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a332a7692ce67ca1cd287f1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 21 11:42:43 2018 +0200 vulkan-1/tests: Add tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/vulkan-1/Makefile.in | 1 + dlls/vulkan-1/tests/Makefile.in | 5 +++ dlls/vulkan-1/tests/vulkan.c | 92 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 100 insertions(+) diff --git a/configure b/configure index bcb660d..ddd6db1 100755 --- a/configure +++ b/configure @@ -19222,6 +19222,7 @@ wine_fn_config_makefile dlls/vnetbios.vxd enable_win16 wine_fn_config_makefile dlls/vssapi enable_vssapi wine_fn_config_makefile dlls/vtdapi.vxd enable_win16 wine_fn_config_makefile dlls/vulkan-1 enable_vulkan_1 +wine_fn_config_makefile dlls/vulkan-1/tests enable_tests wine_fn_config_makefile dlls/vwin32.vxd enable_win16 wine_fn_config_makefile dlls/w32skrnl enable_win16 wine_fn_config_makefile dlls/w32sys.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 469fa8d..68f7f14 100644 --- a/configure.ac +++ b/configure.ac @@ -3721,6 +3721,7 @@ WINE_CONFIG_MAKEFILE(dlls/vnetbios.vxd,enable_win16) WINE_CONFIG_MAKEFILE(dlls/vssapi) WINE_CONFIG_MAKEFILE(dlls/vtdapi.vxd,enable_win16) WINE_CONFIG_MAKEFILE(dlls/vulkan-1) +WINE_CONFIG_MAKEFILE(dlls/vulkan-1/tests) WINE_CONFIG_MAKEFILE(dlls/vwin32.vxd,enable_win16) WINE_CONFIG_MAKEFILE(dlls/w32skrnl,enable_win16) WINE_CONFIG_MAKEFILE(dlls/w32sys.dll16,enable_win16) diff --git a/dlls/vulkan-1/Makefile.in b/dlls/vulkan-1/Makefile.in index 4bb8cec..2abc54d 100644 --- a/dlls/vulkan-1/Makefile.in +++ b/dlls/vulkan-1/Makefile.in @@ -1,5 +1,6 @@ MODULE = vulkan-1.dll IMPORTS = winevulkan +IMPORTLIB = vulkan-1 C_SRCS = \ vulkan.c diff --git a/dlls/vulkan-1/tests/Makefile.in b/dlls/vulkan-1/tests/Makefile.in new file mode 100644 index 0000000..c9f9f07 --- /dev/null +++ b/dlls/vulkan-1/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = vulkan-1.dll +IMPORTS = vulkan-1 + +C_SRCS = \ + vulkan.c diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c new file mode 100644 index 0000000..67da880 --- /dev/null +++ b/dlls/vulkan-1/tests/vulkan.c @@ -0,0 +1,92 @@ +/* + * Copyright 2018 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windows.h" +#include "wine/heap.h" +#include "wine/vulkan.h" +#include "wine/test.h" + +static VkResult create_instance(uint32_t extension_count, + const char * const *enabled_extensions, VkInstance *vk_instance) +{ + VkInstanceCreateInfo create_info; + + create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + create_info.pNext = NULL; + create_info.flags = 0; + create_info.pApplicationInfo = NULL; + create_info.enabledLayerCount = 0; + create_info.ppEnabledLayerNames = NULL; + create_info.enabledExtensionCount = extension_count; + create_info.ppEnabledExtensionNames = enabled_extensions; + + return vkCreateInstance(&create_info, NULL, vk_instance); +} + +static void test_enumerate_physical_devices(void) +{ + VkPhysicalDevice *vk_physical_devices; + VkPhysicalDeviceProperties properties; + VkInstance vk_instance; + unsigned int i; + uint32_t count; + VkResult vr; + + if ((vr = create_instance(0, NULL, &vk_instance)) < 0) + { + skip("Failed to create Vulkan instance, vr %d.\n", vr); + return; + } + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + if (!count) + { + skip("No physical devices.\n"); + vkDestroyInstance(vk_instance, NULL); + return; + } + + trace("Got %u physical device(s).\n", count); + vk_physical_devices = heap_calloc(count, sizeof(*vk_physical_devices)); + ok(!!vk_physical_devices, "Failed to allocate memory.\n"); + vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + for (i = 0; i < count; ++i) + { + vkGetPhysicalDeviceProperties(vk_physical_devices[i], &properties); + + trace("Device '%s', %#x:%#x, driver version %u.%u.%u (%#x), api version %u.%u.%u.\n", + properties.deviceName, properties.vendorID, properties.deviceID, + VK_VERSION_MAJOR(properties.driverVersion), VK_VERSION_MINOR(properties.driverVersion), + VK_VERSION_PATCH(properties.driverVersion), properties.driverVersion, + VK_VERSION_MAJOR(properties.apiVersion), VK_VERSION_MINOR(properties.apiVersion), + VK_VERSION_PATCH(properties.apiVersion)); + } + + heap_free(vk_physical_devices); + + vkDestroyInstance(vk_instance, NULL); +} + +START_TEST(vulkan) +{ + test_enumerate_physical_devices(); +}

1 0