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

Francois Gouget : testbot: Document the user account management procedures.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: tools Branch: master Commit: eb909209aa2686f6fd5ba093e39fbb11b9ce35d6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=eb909209aa2686f6fd5ba093… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:37:38 2013 +0100 testbot: Document the user account management procedures. --- testbot/README | 25 +++++++++++++++++++++++++ testbot/doc/INSTALL.txt | 3 +++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/testbot/README b/testbot/README index 4f4cbc9..f15f82a 100644 --- a/testbot/README +++ b/testbot/README @@ -68,3 +68,28 @@ WineTestBot: --------------- See the doc/INSTALL.txt file. + + +5. USER ACCOUNT MANAGEMENT +-------------------------- + +When a user asks for an account, a provisional account is created immediately +but has to be 'activated' before it can be used. Also an email is sent to the +WineTestBot administrators. + +If the request is considered to be illegitimate / spam, the administrator +should directly delete the provisional account. Otherwise the account should +be approved. + +Approving the account will generate a 'password reset code' and send an email +to the user with a URL to visit to set the account password. That will activate +the account and make it usable. + + +Notes: +* Existing accounts can be suspended by unchecking the 'active' field. This + prevents the user from logging in and changing the password. +* Only accounts that have the 'wine-devel' role can submit jobs. So + administrators who also want to submit jobs should add it to their account + (see the doc/INSTALL.txt file). +* FIXME: Document how the LDAP integration works. diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 4c14668..a5655ec 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -58,6 +58,9 @@ General setup for the web site: 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'); +- If you want to be able to submit jobs from the same account you will likely + need to also give it the 'wine-devel' role: + mysql> insert into UserRoles values('<username>', wine-devel); - When you refresh the home page, you should now have an "Admin" menu in the sidebar.

1 0

Francois Gouget : testbot/build: Remove an unused variable in WineRunBuild. pl.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: tools Branch: master Commit: d26f41afd04edda9c8a23a56217ab6922deadbb2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d26f41afd04edda9c8a23a56… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:49:58 2013 +0100 testbot/build: Remove an unused variable in WineRunBuild.pl. --- testbot/bin/WineRunBuild.pl | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 20a43da..728777a 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -186,7 +186,6 @@ my $TA = $VM->GetAgent(); LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; -my $RptFileName = $VM->Name . ".rpt"; my $StepDir = "$DataDir/jobs/$JobId/$StepNo"; my $TaskDir = "$StepDir/$TaskNo"; my $FullRawlogFileName = "$TaskDir/rawlog";

1 0

Francois Gouget : testbot/build: Clean up FatalError() and stop abusing it.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: tools Branch: master Commit: 4c9e159874c219053ce5e9ba1d3964912f8d0987 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4c9e159874c219053ce5e9ba… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:51:01 2013 +0100 testbot/build: Clean up FatalError() and stop abusing it. If not given an error file and a task it's equivalent to a simple LogMsg() + exit(). --- testbot/bin/WineRunBuild.pl | 91 +++++++++++++++++++--------------------- testbot/bin/WineRunReconfig.pl | 85 ++++++++++++++++++------------------- testbot/bin/WineRunTask.pl | 90 ++++++++++++++++++--------------------- 3 files changed, 125 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=4c9e159874c219053ce5…

1 0

Francois Gouget : testbot/build: Staging is handled before starting the build task.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: tools Branch: master Commit: 90a5a8d483a7132871465580f8f841e9fa97eb21 URL: http://source.winehq.org/git/tools.git/?a=commit;h=90a5a8d483a7132871465580… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:51:08 2013 +0100 testbot/build: Staging is handled before starting the build task. --- testbot/bin/WineRunBuild.pl | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 7fd87b2..236d3d0 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -217,15 +217,8 @@ if (! defined($BaseName)) FatalError "Can't determine base name\n", $FullErrFileName, $Job, $Task; } -my $ErrMessage = $Step->HandleStaging($JobId); -if (defined($ErrMessage)) -{ - FatalError "$ErrMessage\n", $FullErrFileName, $Job, $Task; -} - $VM->Status('running'); -my $ErrProperty; -($ErrProperty, $ErrMessage) = $VM->Save(); +my ($ErrProperty, $ErrMessage) = $VM->Save(); if (defined($ErrMessage)) { FatalError "Can't set VM status to running: $ErrMessage\n",

1 0

Francois Gouget : testbot: Tighten handling of the VM status in the task scripts.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: tools Branch: master Commit: aae43a05737a693f784c8a719b6084b44c5411fc URL: http://source.winehq.org/git/tools.git/?a=commit;h=aae43a05737a693f784c8a71… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:52:30 2013 +0100 testbot: Tighten handling of the VM status in the task scripts. --- testbot/bin/WineRunBuild.pl | 15 +++++++++++++-- testbot/bin/WineRunReconfig.pl | 17 ++++++++++++++--- testbot/bin/WineRunTask.pl | 15 ++++++++++----- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 236d3d0..3f5b592 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -61,8 +61,11 @@ sub FatalError($$$$) $Job->UpdateStatus(); my $VM = $Task->VM; - $VM->Status('dirty'); - $VM->Save(); + if ($VM->Status eq 'running') + { + $VM->Status('dirty'); + $VM->Save(); + } TaskComplete($JobKey, $StepKey, $TaskKey); exit 1; @@ -217,6 +220,13 @@ if (! defined($BaseName)) FatalError "Can't determine base name\n", $FullErrFileName, $Job, $Task; } +# Normally the Engine has already set the VM status to 'running'. +# Do it anyway in case we're called manually from the command line. +if ($VM->Status ne "idle" and $VM->Status ne "running") +{ + FatalError "The VM is not ready for use (" . $VM->Status . ")\n", + $FullErrFileName, $Job, $Task; +} $VM->Status('running'); my ($ErrProperty, $ErrMessage) = $VM->Save(); if (defined($ErrMessage)) @@ -224,6 +234,7 @@ if (defined($ErrMessage)) FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Task; } + my $FileName = $Step->FileName; if (!$TA->SendFile("$StepDir/$FileName", "staging/$FileName", 0)) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 7588045..0333705 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -61,8 +61,11 @@ sub FatalError($$$$) $Job->UpdateStatus(); my $VM = $Task->VM; - $VM->Status('dirty'); - $VM->Save(); + if ($VM->Status eq 'running') + { + $VM->Status('dirty'); + $VM->Save(); + } TaskComplete($JobKey, $StepKey, $TaskKey); exit 1; @@ -190,13 +193,21 @@ my $FullRawlogFileName = "$TaskDir/rawlog"; my $FullLogFileName = "$TaskDir/log"; my $FullErrFileName = "$TaskDir/err"; +# Normally the Engine has already set the VM status to 'running'. +# Do it anyway in case we're called manually from the command line. +if ($VM->Status ne "idle" and $VM->Status ne "running") +{ + FatalError "The VM is not ready for use (" . $VM->Status . ")\n", + $FullErrFileName, $Job, $Task; +} $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; } + my $Script = "#!/bin/sh\n" . "rm -f Reconfig.log\n" . "../bin/build/Reconfig.pl >>Reconfig.log 2>&1\n"; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index ffbb421..abb92e0 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -204,9 +204,16 @@ my $FullLogFileName = "$TaskDir/log"; my $FullErrFileName = "$TaskDir/err"; my $FullScreenshotFileName = "$TaskDir/screenshot.png"; +# Normally the Engine has already set the VM status to 'running'. +# Do it anyway in case we're called manually from the command line. +if ($VM->Status ne "idle" and $VM->Status ne "running") +{ + FatalError "The VM is not ready for use (" . $VM->Status . ")\n", + $FullErrFileName, $Job, $Step, $Task; +} $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, $Step, $Task; @@ -349,10 +356,8 @@ if (!defined $TestFailures) $Task->TestFailures($TestFailures); $Task->Save(); $Job->UpdateStatus(); -if ($Task->VM->Role ne "base") -{ - $Task->VM->PowerOff(); -} + +$VM->PowerOff() if ($VM->Role ne "base"); $VM->Status('dirty'); $VM->Save();

1 0

Francois Gouget : testbot/build: Simplify the log handling.
by Alexandre Julliard 13 Mar '13

13 Mar '13

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/build: Improve the WineRun{Build, Reconfig}. pl error handling.
by Alexandre Julliard 13 Mar '13

13 Mar '13

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

Michael Stefaniuc : kernel32: Avoid TRUE FALSE conditional expressions.
by Alexandre Julliard 12 Mar '13

12 Mar '13

Module: wine Branch: master Commit: 2dcc12aac3b50876bed880ce8acaeb02a43444ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dcc12aac3b50876bed880ce8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 12 10:28:04 2013 +0100 kernel32: Avoid TRUE FALSE conditional expressions. --- dlls/kernel32/sync.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 3264884..6b5a949 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1398,9 +1398,9 @@ HANDLE WINAPI CreateNamedPipeW( LPCWSTR name, DWORD dwOpenMode, options = 0; if (dwOpenMode & FILE_FLAG_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; if (!(dwOpenMode & FILE_FLAG_OVERLAPPED)) options |= FILE_SYNCHRONOUS_IO_NONALERT; - pipe_type = (dwPipeMode & PIPE_TYPE_MESSAGE) ? TRUE : FALSE; - read_mode = (dwPipeMode & PIPE_READMODE_MESSAGE) ? TRUE : FALSE; - non_block = (dwPipeMode & PIPE_NOWAIT) ? TRUE : FALSE; + pipe_type = (dwPipeMode & PIPE_TYPE_MESSAGE) != 0; + read_mode = (dwPipeMode & PIPE_READMODE_MESSAGE) != 0; + non_block = (dwPipeMode & PIPE_NOWAIT) != 0; if (nMaxInstances >= PIPE_UNLIMITED_INSTANCES) nMaxInstances = ~0U; timeout.QuadPart = (ULONGLONG)nDefaultTimeOut * -10000;

1 0

Andrew Talbot : msvcp71: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 12 Mar '13

12 Mar '13

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

Sergey Guralnik : user32: Use window height/ width instead of client for combo resizing.
by Alexandre Julliard 12 Mar '13

12 Mar '13

Module: wine Branch: master Commit: ac0738471da49f57105d7d5498603d73fbc650f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac0738471da49f57105d7d549… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Fri Mar 8 22:28:39 2013 +0200 user32: Use window height/width instead of client for combo resizing. --- dlls/user32/combo.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index d20005c..346b346 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1507,7 +1507,7 @@ static void CBResetPos( /*********************************************************************** * COMBO_Size */ -static void COMBO_Size( LPHEADCOMBO lphc, LPARAM lParam ) +static void COMBO_Size( LPHEADCOMBO lphc ) { /* * Those controls are always the same height. So we have to make sure @@ -1515,8 +1515,12 @@ static void COMBO_Size( LPHEADCOMBO lphc, LPARAM lParam ) */ if( CB_GETTYPE(lphc) != CBS_SIMPLE ) { - int newComboHeight; + int newComboHeight, curComboHeight, curComboWidth; + RECT rc; + GetWindowRect(lphc->self, &rc); + curComboHeight = rc.bottom - rc.top; + curComboWidth = rc.right - rc.left; newComboHeight = CBGetTextAreaHeight(lphc->self, lphc) + 2*COMBO_YBORDERSIZE(); /* @@ -1527,18 +1531,18 @@ static void COMBO_Size( LPHEADCOMBO lphc, LPARAM lParam ) * the actual control, for example, to do the layout of a dialog that is * resized, the height of the dropdown is not changed. */ - if( HIWORD(lParam) > newComboHeight ) + if( curComboHeight > newComboHeight ) { TRACE("oldComboHeight=%d, newComboHeight=%d, oldDropBottom=%d, oldDropTop=%d\n", - HIWORD(lParam), newComboHeight, lphc->droppedRect.bottom, + curComboHeight, newComboHeight, lphc->droppedRect.bottom, lphc->droppedRect.top); - lphc->droppedRect.bottom = lphc->droppedRect.top + HIWORD(lParam) - newComboHeight; + lphc->droppedRect.bottom = lphc->droppedRect.top + curComboHeight - newComboHeight; } /* * Restore original height */ - if( HIWORD(lParam) != newComboHeight ) - SetWindowPos(lphc->self, 0, 0, 0, LOWORD(lParam), newComboHeight, + if( curComboHeight != newComboHeight ) + SetWindowPos(lphc->self, 0, 0, 0, curComboWidth, newComboHeight, SWP_NOZORDER|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOREDRAW); } @@ -1862,7 +1866,7 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar } case WM_SIZE: if( lphc->hWndLBox && - !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc, lParam ); + !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc ); return TRUE; case WM_SETFONT: COMBO_Font( lphc, (HFONT)wParam, (BOOL)lParam );

1 0