March 2013 - Wine-Commits - list.winehq.org

Francois Gouget : testbot/build: Improve the WineRun{Build, Reconfig}. pl error handling.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 1e7c07b2d89ad828c65cc6a61c2762ff9378b356 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1e7c07b2d89ad828c65cc6a6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:53:36 2013 +0100 testbot/build: Improve the WineRun{Build,Reconfig}.pl error handling. Don't try to copy the generated executables in WineRunBuild.pl if the build failed. Document what happens if we fail to take a new snapshot in WineRunReconfig.pl. --- testbot/bin/WineRunBuild.pl | 105 ++++++++++++++++++++-------------------- testbot/bin/WineRunReconfig.pl | 29 +++++++---- 2 files changed, 71 insertions(+), 63 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index e7dfafd..f750a0b 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -198,29 +198,24 @@ my $TaskDir = "$StepDir/$TaskNo"; my $FullLogFileName = "$TaskDir/log"; my $FullErrFileName = "$TaskDir/err"; -my $BaseName; -my $Run64 = !1; +my ($Run64, $BaseName); foreach my $OtherStep (@{$Job->Steps->GetItems()}) { - if ($OtherStep->No != $StepNo) + next if ($OtherStep->No == $StepNo); + + $Run64 = 1 if ($OtherStep->FileType eq "exe64"); + my $OtherFileName = $OtherStep->FileName; + if ($OtherFileName =~ m/^([\w_\-]+)(|\.exe)_test(|64)\.exe$/) { - my $OtherFileName = $OtherStep->FileName; - if ($OtherFileName =~ m/^([\w_\-]+)(|\.exe)_test(|64)\.exe$/) + if (defined $BaseName and $BaseName ne $1) { - if (defined $BaseName && $BaseName ne $1) - { - FatalError "$1 doesn't match previously found $BaseName\n", - $FullErrFileName, $Job, $Task; - } - $BaseName = $1; - if ($OtherStep->FileType eq "exe64") - { - $Run64 = 1; - } + FatalError "$1 doesn't match previously found $BaseName\n", + $FullErrFileName, $Job, $Task; } + $BaseName = $1; } } -if (! defined($BaseName)) +if (!defined $BaseName) { FatalError "Can't determine base name\n", $FullErrFileName, $Job, $Task; } @@ -234,7 +229,7 @@ if ($VM->Status ne "idle" and $VM->Status ne "running") } $VM->Status('running'); my ($ErrProperty, $ErrMessage) = $VM->Save(); -if (defined($ErrMessage)) +if (defined $ErrMessage) { FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Task; @@ -244,7 +239,7 @@ my $FileName = $Step->FileName; if (!$TA->SendFile("$StepDir/$FileName", "staging/$FileName", 0)) { $ErrMessage = $TA->GetLastError(); - FatalError "Can't copy patch to VM: $ErrMessage\n", + FatalError "Could not copy the patch to the VM: $ErrMessage\n", $FullErrFileName, $Job, $Task; } my $Script = "#!/bin/sh\n" . @@ -256,61 +251,67 @@ $Script .= " >>Build.log 2>&1\n"; if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) { $ErrMessage = $TA->GetLastError(); - FatalError "Can't send the script to VM: $ErrMessage\n", + FatalError "Can't send the build script to the VM: $ErrMessage\n", $FullErrFileName, $Job, $Task; } my $Pid = $TA->Run(["./task"], 0); if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout)) { $ErrMessage = $TA->GetLastError(); + # Try to grab the build log before reporting the failure } - -if (defined($ErrMessage)) +my $NewStatus; +if ($TA->GetFile("Build.log", $FullLogFileName)) { - $TA->GetFile("Build.log", $FullLogFileName); - ProcessLog($FullLogFileName, $FullErrFileName); - FatalError "Failure running script in VM: $ErrMessage\n", - $FullErrFileName, $Job, $Task; + $NewStatus = ProcessLog($FullLogFileName, $FullErrFileName); } - -if (!$TA->GetFile("Build.log", $FullLogFileName)) +elsif (!defined $ErrMessage) { + # This GetFile() error is the first one so report it $ErrMessage = $TA->GetLastError(); - FatalError "Can't copy log from VM: $ErrMessage\n", + FatalError "Can't copy the build log from the VM: $ErrMessage\n", + $FullErrFileName, $Job, $Task; +} +if (defined $ErrMessage) +{ + # Now we can report the previous Run() / Wait() error + FatalError "Failure running the build script in the VM: $ErrMessage\n", $FullErrFileName, $Job, $Task; } -my $NewStatus = ProcessLog($FullLogFileName, $FullErrFileName); -foreach my $OtherStep (@{$Job->Steps->GetItems()}) +# Don't try copying the test executables if the build step failed +if ($NewStatus eq "completed") { - if ($OtherStep->No != $StepNo) + foreach my $OtherStep (@{$Job->Steps->GetItems()}) { + next if ($OtherStep->No == $StepNo); + my $OtherFileName = $OtherStep->FileName; - if ($OtherFileName =~ m/^[\w_\-]+(|\.exe)_test(|64)\.exe$/) - { - my $OtherStepDir = "$DataDir/jobs/$JobId/" . $OtherStep->No; - mkdir $OtherStepDir; + next if ($OtherFileName !~ /^[\w_\-]+(?:|\.exe)_test(?:|64)\.exe$/); - my $Bits = $OtherStep->FileType eq "exe64" ? "64" : "32"; - my $TestExecutable; - if ($Step->FileType ne "patchprograms") - { - $TestExecutable = "build-mingw$Bits/dlls/$BaseName/tests/${BaseName}_test.exe"; - } - else - { - $TestExecutable = "build-mingw$Bits/programs/$BaseName/tests/${BaseName}.exe_test.exe"; - } - if (!$TA->GetFile($TestExecutable, "$OtherStepDir/$OtherFileName")) - { - $ErrMessage = $TA->GetLastError(); - FatalError "Can't copy generated executable from VM: $ErrMessage\n", - $FullErrFileName, $Job, $Task; - } - chmod 0664, "$OtherStepDir/$OtherFileName"; + my $OtherStepDir = "$DataDir/jobs/$JobId/" . $OtherStep->No; + mkdir $OtherStepDir; + + my $Bits = $OtherStep->FileType eq "exe64" ? "64" : "32"; + my $TestExecutable; + if ($Step->FileType ne "patchprograms") + { + $TestExecutable = "build-mingw$Bits/dlls/$BaseName/tests/${BaseName}_test.exe"; + } + else + { + $TestExecutable = "build-mingw$Bits/programs/$BaseName/tests/${BaseName}.exe_test.exe"; } + if (!$TA->GetFile($TestExecutable, "$OtherStepDir/$OtherFileName")) + { + $ErrMessage = $TA->GetLastError(); + FatalError "Can't copy the generated executable from the VM: $ErrMessage\n", + $FullErrFileName, $Job, $Task; + } + chmod 0664, "$OtherStepDir/$OtherFileName"; } } + $TA->Disconnect(); $Task->Status($NewStatus); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 7460361..5d9d6b3 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -219,32 +219,36 @@ my $Script = "#!/bin/sh\n" . if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) { $ErrMessage = $TA->GetLastError(); - FatalError "Can't send the script to VM: $ErrMessage\n", + FatalError "Can't send the script to the VM: $ErrMessage\n", $FullErrFileName, $Job, $Task; } my $Pid = $TA->Run(["./task"], 0); if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout)) { $ErrMessage = $TA->GetLastError(); + # Try to grab the reconfig log before reporting the failure } - -if (defined($ErrMessage)) +my $NewStatus; +if ($TA->GetFile("Reconfig.log", $FullLogFileName)) { - $TA->GetFile("Reconfig.log", $FullLogFileName); - ProcessLog($FullLogFileName, $FullErrFileName); - FatalError "Failure running script in VM: $ErrMessage\n", - $FullErrFileName, $Job, $Task; + $NewStatus = ProcessLog($FullLogFileName, $FullErrFileName); } - -if (!$TA->GetFile("Reconfig.log", $FullLogFileName)) +elsif (!defined $ErrMessage) { + # This GetFile() error is the first one so report it $ErrMessage = $TA->GetLastError(); - FatalError "Can't copy log from VM: $ErrMessage\n", + FatalError "Can't copy the reconfig log from the VM: $ErrMessage\n", + $FullErrFileName, $Job, $Task; +} +if (defined $ErrMessage) +{ + # Now we can report the previous Run() / Wait() error + FatalError "Could not run the reconfig script in the VM: $ErrMessage\n", $FullErrFileName, $Job, $Task; } + $TA->Disconnect(); -my $NewStatus = ProcessLog($FullLogFileName, $FullErrFileName); if ($NewStatus eq "completed") { $ErrMessage = $VM->RemoveSnapshot($VM->IdleSnapshot); @@ -257,6 +261,9 @@ if ($NewStatus eq "completed") $ErrMessage = $VM->CreateSnapshot($VM->IdleSnapshot); if (defined($ErrMessage)) { + # Without the snapshot the VM is not usable anymore but FatalError() will + # just mark it as 'dirty'. It's only the next time it is used that the + # problem will be noticed and that it will be taken offline. FatalError "Can't take snapshot: $ErrMessage\n", $FullErrFileName, $Job, $Task; }

1 0

Francois Gouget : testbot/build: Simplify the log handling.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 04b85f724825512ef257d1abe5fd148e286f2a46 URL: http://source.winehq.org/git/tools.git/?a=commit;h=04b85f724825512ef257d1ab… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:52:55 2013 +0100 testbot/build: Simplify the log handling. We no longer remove the Build / Reconfig status lines. This means we no longer need separate raw and processed logs. Also better report log processing errors. Specify a prototype for ProcessLog(). --- testbot/bin/WineRunBuild.pl | 88 ++++++++++++++++++++------------------ testbot/bin/WineRunReconfig.pl | 93 ++++++++++++++++++++------------------- 2 files changed, 94 insertions(+), 87 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 3f5b592..e7dfafd 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -71,55 +71,61 @@ sub FatalError($$$$) exit 1; } -sub ProcessRawlog +sub ProcessLog($$) { - my ($FullRawlogFileName, $FullLogFileName, $FullErrFileName) = @_; + my ($FullLogFileName, $FullErrFileName) = @_; - my $FoundOk = !1; - if (open RAWLOG, "<$FullRawlogFileName") + my ($Status, $Errors); + if (open(my $LogFile, "<", $FullLogFileName)) { - if (open LOG, ">$FullLogFileName") + # Collect and analyze the 'Build:' status line(s) + $Errors = ""; + foreach my $Line (<$LogFile>) { - if (open ERR, ">$FullErrFileName") + chomp($Line); + next if ($Line !~ /^Build: (.*)$/); + if ($1 ne "ok") { - my $Line; - while (defined($Line = <RAWLOG>)) - { - chomp($Line); - if ($Line =~ m/^Build: (.*)$/) - { - if ($1 eq "ok") - { - $FoundOk = 1; - } - else - { - print ERR "$1\n"; - } - } - else - { - print LOG "$Line\n"; - } - } - - close ERR; - if (-z $FullErrFileName) - { - unlink($FullErrFileName); - } + $Errors .= "$1\n"; + $Status = "failed"; } + elsif (!defined $Status) + { + $Status = "completed"; + } + } + close($LogFile); - close LOG; + if (!defined $Status) + { + $Status = "failed"; + $Errors = "Missing build status line\n"; } + } + else + { + $Status = "failed"; + $Errors = "Unable to open the log file\n"; + LogMsg "Unable to open '$FullLogFileName' for reading: $!\n"; + } - close RAWLOG; - unlink($FullRawlogFileName); + if ($Errors) + { + if (open(my $ErrFile, ">", $FullErrFileName)) + { + print $ErrFile $Errors; + close($ErrFile); + } + else + { + LogMsg "Unable to open '$FullErrFileName' for writing: $!\n"; + } } - return $FoundOk; + return $Status; } + $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; @@ -189,7 +195,6 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; my $StepDir = "$DataDir/jobs/$JobId/$StepNo"; my $TaskDir = "$StepDir/$TaskNo"; -my $FullRawlogFileName = "$TaskDir/rawlog"; my $FullLogFileName = "$TaskDir/log"; my $FullErrFileName = "$TaskDir/err"; @@ -262,20 +267,19 @@ if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout)) if (defined($ErrMessage)) { - $TA->GetFile("Build.log", $FullRawlogFileName); - ProcessRawlog($FullRawlogFileName, $FullLogFileName, $FullErrFileName); + $TA->GetFile("Build.log", $FullLogFileName); + ProcessLog($FullLogFileName, $FullErrFileName); FatalError "Failure running script in VM: $ErrMessage\n", $FullErrFileName, $Job, $Task; } -if (!$TA->GetFile("Build.log", $FullRawlogFileName)) +if (!$TA->GetFile("Build.log", $FullLogFileName)) { $ErrMessage = $TA->GetLastError(); FatalError "Can't copy log from VM: $ErrMessage\n", $FullErrFileName, $Job, $Task; } -my $NewStatus = ProcessRawlog($FullRawlogFileName, $FullLogFileName, - $FullErrFileName) ? "completed" : "failed"; +my $NewStatus = ProcessLog($FullLogFileName, $FullErrFileName); foreach my $OtherStep (@{$Job->Steps->GetItems()}) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 0333705..7460361 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -71,55 +71,61 @@ sub FatalError($$$$) exit 1; } -sub ProcessRawlog +sub ProcessLog($$) { - my ($FullRawlogFileName, $FullLogFileName, $FullErrFileName) = @_; + my ($FullLogFileName, $FullErrFileName) = @_; - my $FoundOk = !1; - if (open RAWLOG, "<$FullRawlogFileName") + my ($Status, $Errors); + if (open(my $LogFile, "<", $FullLogFileName)) { - if (open LOG, ">$FullLogFileName") + # Collect and analyze the 'Reconfig:' status line(s) + $Errors = ""; + foreach my $Line (<$LogFile>) { - if (open ERR, ">$FullErrFileName") + chomp($Line); + next if ($Line !~ /^Reconfig: (.*)$/); + if ($1 ne "ok") { - my $Line; - while (defined($Line = <RAWLOG>)) - { - chomp($Line); - if ($Line =~ m/^Reconfig: (.*)$/) - { - if ($1 eq "ok") - { - $FoundOk = 1; - } - else - { - print ERR "$1\n"; - } - } - else - { - print LOG "$Line\n"; - } - } - - close ERR; - if (-z $FullErrFileName) - { - unlink($FullErrFileName); - } + $Errors .= "$1\n"; + $Status = "failed"; } + elsif (!defined $Status) + { + $Status = "completed"; + } + } + close($LogFile); - close LOG; + if (!defined $Status) + { + $Status = "failed"; + $Errors = "Missing reconfig status line\n"; } + } + else + { + $Status = "failed"; + $Errors = "Unable to open the log file\n"; + LogMsg "Unable to open '$FullLogFileName' for reading: $!\n"; + } - close RAWLOG; - unlink($FullRawlogFileName); + if ($Errors) + { + if (open(my $ErrFile, ">", $FullErrFileName)) + { + print $ErrFile $Errors; + close($ErrFile); + } + else + { + LogMsg "Unable to open '$FullErrFileName' for writing: $!\n"; + } } - return $FoundOk; + return $Status; } + $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; @@ -189,7 +195,6 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; my $StepDir = "$DataDir/jobs/$JobId/$StepNo"; my $TaskDir = "$StepDir/$TaskNo"; -my $FullRawlogFileName = "$TaskDir/rawlog"; my $FullLogFileName = "$TaskDir/log"; my $FullErrFileName = "$TaskDir/err"; @@ -225,13 +230,13 @@ if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout)) if (defined($ErrMessage)) { - $TA->GetFile("Reconfig.log", $FullRawlogFileName); - ProcessRawlog($FullRawlogFileName, $FullLogFileName, $FullErrFileName); + $TA->GetFile("Reconfig.log", $FullLogFileName); + ProcessLog($FullLogFileName, $FullErrFileName); FatalError "Failure running script in VM: $ErrMessage\n", $FullErrFileName, $Job, $Task; } -if (!$TA->GetFile("Reconfig.log", $FullRawlogFileName)) +if (!$TA->GetFile("Reconfig.log", $FullLogFileName)) { $ErrMessage = $TA->GetLastError(); FatalError "Can't copy log from VM: $ErrMessage\n", @@ -239,9 +244,8 @@ if (!$TA->GetFile("Reconfig.log", $FullRawlogFileName)) } $TA->Disconnect(); -my $Success = ProcessRawlog($FullRawlogFileName, $FullLogFileName, - $FullErrFileName); -if ($Success) +my $NewStatus = ProcessLog($FullLogFileName, $FullErrFileName); +if ($NewStatus eq "completed") { $ErrMessage = $VM->RemoveSnapshot($VM->IdleSnapshot); if (defined($ErrMessage)) @@ -258,14 +262,13 @@ if ($Success) } $VM->Status("idle"); - $Task->Status("completed"); } else { - $Task->Status("failed"); $VM->Status("dirty"); } +$Task->Status($NewStatus); $Task->ChildPid(undef); $Task->Ended(time); $Task->Save();

1 0

Francois Gouget : testbot: Fix a typo in the MySQL setup section.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 11bfc2af4c49a4a544eaf00e2b7f5517512333c6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=11bfc2af4c49a4a544eaf00e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:37:21 2013 +0100 testbot: Fix a typo in the MySQL setup section. The sample winetestbot.sql script now sets up the required winetestbot privileges. Also some more documentation formatting tweaks. --- testbot/doc/INSTALL.txt | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 4e4e33c..4c14668 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -14,10 +14,8 @@ Dependencies: MySQL setup: - Create a new 'winetestbot' database and its tables using the ddl/winetestbot.sql script. -- Set the 'winetestbot' user password - INSERT, UPDATE and DELETE on all tables in the database. So this is - something like: - SET PASSWORD FOR 'winetestbot'@'localhost' = PASSWORD('mypassword'); +- Make sure to change the 'winetestbot' user password. Typically: + SET PASSWORD FOR 'winetestbot'@'localhost' = PASSWORD('mypassword'); Apache setup: - Create a new virtual host, use doc/vhost_winetestbot.conf as a @@ -55,11 +53,11 @@ General setup for the web site: - Register a new account for yourself. - Using the mysql client, set the ResetCode in your Users entry to a known value, e.g. - mysql> update Users set ResetCode = 'a' where Name = '<username>'; + mysql> update Users set ResetCode = 'a' where Name = '<username>'; - Browse to http://server.name/ResetPassword.pl and enter your username, the resetcode you just updated and a new password. - Make yourself admin by adding a row to UserRoles: - mysql> insert into UserRoles values('<username>', 'admin'); + mysql> insert into UserRoles values('<username>', 'admin'); - When you refresh the home page, you should now have an "Admin" menu in the sidebar. @@ -113,7 +111,7 @@ Setup for wine-patches: | $HOME/tools/testbot/bin/WinePatchesMLSubmit.pl - Or if you have a set of patches to test in the mbox format you can test with: - formail -ds $HOME/tools/testbot/bin/WinePatchesMLSubmit.pl <mbox-file + formail -ds $HOME/tools/testbot/bin/WinePatchesMLSubmit.pl <mbox-file 2. VM hosts setup

1 0

Francois Gouget : testbot/CheckForWinetestUpdate: Use a shorter name for the WineTest jobs.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 918d9a53cca257efa6d384dde4c4d075aeee2559 URL: http://source.winehq.org/git/tools.git/?a=commit;h=918d9a53cca257efa6d384dd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:19:03 2013 +0100 testbot/CheckForWinetestUpdate: Use a shorter name for the WineTest jobs. --- testbot/bin/CheckForWinetestUpdate.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 2e28cdc..c776fe5 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -60,7 +60,7 @@ sub AddJob my $NewJob = $Jobs->Add(); $NewJob->User(WineTestBot::Users->GetBatchUser()); $NewJob->Priority($BaseJob && $Bits == 32 ? 6 : 7); - $NewJob->Remarks("http://test.winehq.org job - " . + $NewJob->Remarks("WineTest: " . ($Bits == 32 ? ($BaseJob ? "base" : "other") : "64-bit") . " VMs");

1 0

Francois Gouget : testbot: Don't hardcode the WineTestBot name.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 9e7cc538135367f1846b782e7b5b1caf609aca8c URL: http://source.winehq.org/git/tools.git/?a=commit;h=9e7cc538135367f1846b782e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 15:37:28 2013 +0100 testbot: Don't hardcode the WineTestBot name. --- testbot/bin/RevertVM.pl | 2 +- testbot/bin/WineSendLog.pl | 4 ++-- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 8 ++++---- testbot/lib/WineTestBot/Users.pm | 4 ++-- testbot/scripts/CheckWineTestBot.pl | 2 +- testbot/web/Feedback.pl | 4 ++-- testbot/web/Register.pl | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index 7d3359e..f9edeb7 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -57,7 +57,7 @@ sub FatalError my $VMSnapshot = $VM->IdleSnapshot; open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; -From: <$RobotEMail> (Marvin) +From: $RobotEMail To: $AdminEMail Subject: VM $VMKey offline diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 04e9009..515b6c8 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -190,7 +190,7 @@ sub SendLog my @SortedKeys = sort @{$StepsTasks->GetKeys()}; open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); - print SENDMAIL "From: Marvin <$RobotEMail>\n"; + print SENDMAIL "From: $RobotEMail\n"; print SENDMAIL "To: $To\n"; my $Subject = "TestBot job " . $Job->Id . " results"; my $Description = $Job->GetDescription(); @@ -425,7 +425,7 @@ EOF if ($Messages) { open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); - print SENDMAIL "From: Marvin <$RobotEMail>\n"; + print SENDMAIL "From: $RobotEMail\n"; print SENDMAIL "To: $To\n"; print SENDMAIL "Cc: $WinePatchCc\n"; print SENDMAIL "Subject: Re: ", $Job->Patch->Subject, "\n"; diff --git a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl index 38e6a3a..544ac3e 100644 --- a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl +++ b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl @@ -31,10 +31,10 @@ $WineTestBot::Config::DbUsername = "winetestbot"; # The password of the database account $WineTestBot::Config::DbPassword = ""; -# Email address of the WineTestBot administrator +# Name and email address of the WineTestBot administrator $WineTestBot::Config::AdminEMail = undef; -# From address of mails sent by WineTestBot to users +# Name and address for the 'From' field of mails sent by WineTestBot $WineTestBot::Config::RobotEMail = undef; # If set, sends the results to the specified email address instead of the @@ -42,8 +42,8 @@ $WineTestBot::Config::RobotEMail = undef; # can provide useful results to Wine developers. $WineTestBot::Config::WinePatchToOverride = $WineTestBot::Config::AdminEMail; -# If set, CC the results to the specified email address, for instance the -# wine-devel mailing list. +# If set, CC the results to the specified name + email address, for instance +# the wine-devel mailing list. $WineTestBot::Config::WinePatchCc = ""; # Email address to send the results to for integration with the Wine Patches diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 2e6eedc..54c07bf 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -149,7 +149,7 @@ sub Approve my $Recipient = $self->GetEMailRecipient(); open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; -From: <$RobotEMail> (Marvin) +From: $RobotEMail To: $Recipient Subject: winetestbot account request @@ -189,7 +189,7 @@ sub SendResetCode my $Recipient = $self->GetEMailRecipient(); open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; -From: <$RobotEMail> (Marvin) +From: $RobotEMail To: $Recipient Subject: winetestbot account request diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl index 6415dc3..5e8a053 100755 --- a/testbot/scripts/CheckWineTestBot.pl +++ b/testbot/scripts/CheckWineTestBot.pl @@ -49,7 +49,7 @@ if (! PingEngine()) open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; -From: <$RobotEMail> (Marvin) +From: $RobotEMail To: $AdminEMail Subject: WineTestBot engine died diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index 626a7f8..c266ce4 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -111,8 +111,8 @@ sub OnSend open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; -From: <$RobotEMail> (Marvin) -To: <$AdminEMail> +From: $RobotEMail +To: $AdminEMail Subject: winetestbot feedback EOF diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index 6d8e7f4..766d363 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -116,8 +116,8 @@ sub OnSendRequest open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; -From: <$RobotEMail> (Marvin) -To: <$AdminEMail> +From: $RobotEMail +To: $AdminEMail Subject: winetestbot account request $Msg

1 0

Francois Gouget : testbot/TestAgent: Send file data in 64KiB chunks to ( slightly) reduce overhead.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 3e03d63c5a11c73a280b8fcb828f083db57f5f4d URL: http://source.winehq.org/git/tools.git/?a=commit;h=3e03d63c5a11c73a280b8fcb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 15:33:55 2013 +0100 testbot/TestAgent: Send file data in 64KiB chunks to (slightly) reduce overhead. --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- testbot/src/testagentd/testagentd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 2b834f7..645a18c 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -27,7 +27,7 @@ require Exporter; @ISA = qw(Exporter); @EXPORT_OK = qw(new); -my $BLOCK_SIZE = 4096; +my $BLOCK_SIZE = 65536; my $RPC_PING = 0; my $RPC_GETFILE = 1; diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index c06af72..534495d 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -37,7 +37,7 @@ */ #define PROTOCOL_VERSION "testagentd 1.2" -#define BLOCK_SIZE 4096 +#define BLOCK_SIZE 65536 const char *name0; int opt_debug = 0;

1 0

Francois Gouget : winetest: Link the individual test result pages to the configuration / dll versions page.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 703b769e28a5be47d353c44e111aa7f463140e5e URL: http://source.winehq.org/git/tools.git/?a=commit;h=703b769e28a5be47d353c44e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 15:07:36 2013 +0100 winetest: Link the individual test result pages to the configuration / dll versions page. --- winetest/dissect | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index f2e18a2..fe80a44 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -407,6 +407,7 @@ for (my $i = 0; $i <= $#boxes; $i++) print FILE "<div class=\"navbar\">"; print FILE $boxes[$i]->{prev} ? "<a href=\"./$boxes[$i]->{prev}.html\">prev</a> | " : "prev | "; print FILE $boxes[$i]->{next} ? "<a href=\"./$boxes[$i]->{next}.html\">next</a> | " : "next | "; + print FILE "<a href=\"version.html\">info</a> | "; printf FILE "<a href=\"report.html%s\">full report</a> | ", $i ? "#$boxes[$i]->{id}" : ""; print FILE "<a href=\"..\">summary</a> | <a href=\"../..\">index</a></div>\n";

1 0

Stefan Dösinger : ddraw/tests: Use a software VP device in test_surface_interface_mismatch.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: f39443787ad4ca270078203abb5cf2e9ebc545ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f39443787ad4ca270078203ab… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 12 07:20:32 2013 -0700 ddraw/tests: Use a software VP device in test_surface_interface_mismatch. --- dlls/ddraw/tests/ddraw7.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 90e666f..027e03a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -940,7 +940,7 @@ static void test_surface_interface_mismatch(void) } memset(&z_fmt, 0, sizeof(z_fmt)); - hr = IDirect3D7_EnumZBufferFormats(d3d, &IID_IDirect3DTnLHalDevice, enum_z_fmt, &z_fmt); + hr = IDirect3D7_EnumZBufferFormats(d3d, &IID_IDirect3DHALDevice, enum_z_fmt, &z_fmt); if (FAILED(hr) || !z_fmt.dwSize) { skip("No depth buffer formats available, skipping test.\n"); @@ -968,7 +968,7 @@ static void test_surface_interface_mismatch(void) goto cleanup; /* Here too */ - hr = IDirect3D7_CreateDevice(d3d, &IID_IDirect3DTnLHalDevice, (IDirectDrawSurface7 *)surface3, &device); + hr = IDirect3D7_CreateDevice(d3d, &IID_IDirect3DHALDevice, (IDirectDrawSurface7 *)surface3, &device); ok(SUCCEEDED(hr), "Failed to create d3d device.\n"); if (FAILED(hr)) goto cleanup;

1 0

Stefan Dösinger : ddraw/tests: Use a TnLHal device only if supported in ddraw7 tests.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: a990dbfa223c7fb3ebe8830f1a5361159b567e37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a990dbfa223c7fb3ebe8830f1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 12 07:20:31 2013 -0700 ddraw/tests: Use a TnLHal device only if supported in ddraw7 tests. Intel GPUs don't support d3d7 hardware vertexprocessing on Windows. In d3d8 and d3d9 it is available starting with i965 chips, but for some reason the driver does not expose this for d3d7. --- dlls/ddraw/tests/ddraw7.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 6651687..90e666f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -202,6 +202,17 @@ static IDirectDraw7 *create_ddraw(void) return ddraw; } +static HRESULT WINAPI enum_devtype_cb(char *desc_str, char *name, D3DDEVICEDESC7 *desc, void *ctx) +{ + BOOL *hal_ok = ctx; + if (IsEqualGUID(&desc->deviceGUID, &IID_IDirect3DTnLHalDevice)) + { + *hal_ok = TRUE; + return DDENUMRET_CANCEL; + } + return DDENUMRET_OK; +} + static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level) { IDirectDrawSurface7 *surface, *ds; @@ -211,6 +222,8 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level) IDirectDraw7 *ddraw; IDirect3D7 *d3d7; HRESULT hr; + BOOL hal_ok = FALSE; + const GUID *devtype = &IID_IDirect3DHALDevice; if (!(ddraw = create_ddraw())) return NULL; @@ -249,8 +262,12 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level) return NULL; } + hr = IDirect3D7_EnumDevices(d3d7, enum_devtype_cb, &hal_ok); + ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr); + if (hal_ok) devtype = &IID_IDirect3DTnLHalDevice; + memset(&z_fmt, 0, sizeof(z_fmt)); - hr = IDirect3D7_EnumZBufferFormats(d3d7, &IID_IDirect3DTnLHalDevice, enum_z_fmt, &z_fmt); + hr = IDirect3D7_EnumZBufferFormats(d3d7, devtype, enum_z_fmt, &z_fmt); if (FAILED(hr) || !z_fmt.dwSize) { IDirect3D7_Release(d3d7); @@ -284,7 +301,7 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level) return NULL; } - hr = IDirect3D7_CreateDevice(d3d7, &IID_IDirect3DTnLHalDevice, surface, &device); + hr = IDirect3D7_CreateDevice(d3d7, devtype, surface, &device); IDirect3D7_Release(d3d7); IDirectDrawSurface7_Release(surface); if (FAILED(hr))

1 0

Andrew Talbot : msvcp71: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: 0515b44f2f3de0df76e79eacf2a9aa8d714b2ac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0515b44f2f3de0df76e79eacf… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 11 20:48:38 2013 +0000 msvcp71: Avoid signed-unsigned integer comparisons. --- dlls/msvcp71/ios.c | 2 +- dlls/msvcp71/misc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index cbfc78b..8fe6000 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -2560,7 +2560,7 @@ static FILE* _Fiopen_wchar(const wchar_t *name, int mode, int prot) }; int real_mode = mode & ~(OPENMODE_ate|OPENMODE__Nocreate|OPENMODE__Noreplace|OPENMODE_binary); - int mode_idx; + unsigned int mode_idx; FILE *f = NULL; TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot); diff --git a/dlls/msvcp71/misc.c b/dlls/msvcp71/misc.c index 21ca929..227c1b8 100644 --- a/dlls/msvcp71/misc.c +++ b/dlls/msvcp71/misc.c @@ -160,7 +160,7 @@ unsigned short __cdecl wctype(const char *property) { "upper", _UPPER }, { "xdigit", _HEX } }; - int i; + unsigned int i; for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) if(!strcmp(property, properties[i].name))

1 0