wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Francois Gouget : testbot/TestAgent: Fix the TestAgent script parameter checks.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: tools Branch: master Commit: de94f940a061c8d5525f1ef52759b1cddeedf2ac URL: http://source.winehq.org/git/tools.git/?a=commit;h=de94f940a061c8d5525f1ef5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 12:08:55 2012 +0100 testbot/TestAgent: Fix the TestAgent script parameter checks. --- testbot/scripts/TestAgent | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index b861ba2..6d241b5 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -167,25 +167,25 @@ if (!defined $Usage) error("you must specify a command\n"); $Usage = 2; } - elsif ($Cmd eq "run" and !@Run) + elsif ($Cmd ne "sendfile" and $SendFlags) { - error("you must specify the command to run\n"); + error("the --sendfile-xxx options can only be used with the sendfile command\n"); $Usage = 2; } - elsif ($Cmd eq "rm" and !@Rm) + elsif ($Cmd eq "run" and !@Run) { - error("you must specify the server files to delete\n"); + error("you must specify the command to run\n"); $Usage = 2; } - if ($Cmd ne "run" and ($RunFlags or defined $RunIn or defined $RunOut or + elsif ($Cmd ne "run" and ($RunFlags or defined $RunIn or defined $RunOut or defined $RunErr)) { error("the --run-xxx options can only be used with the run command\n"); $Usage = 2; } - elsif ($Cmd ne "sendfile" and $SendFlags) + elsif ($Cmd eq "rm" and !@Rm) { - error("the --sendfile-xxx options can only be used with the sendfile command\n"); + error("you must specify the server files to delete\n"); $Usage = 2; } $AgentPort = $Port if (defined $Port);

1 0

Francois Gouget : testbot/TestAgent: Fix the $Debug variable default value and check.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: tools Branch: master Commit: 654bcdd17e53e80ed3b65ab6625e74e03bdb1bfd URL: http://source.winehq.org/git/tools.git/?a=commit;h=654bcdd17e53e80ed3b65ab6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 12:08:14 2012 +0100 testbot/TestAgent: Fix the $Debug variable default value and check. --- testbot/lib/WineTestBot/TestAgent.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 8bc3e59..92d20bb 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -45,7 +45,7 @@ my %RpcNames=( $RPC_RM => 'rm', ); -my $Debug = 1; +my $Debug = 0; sub debug(@) { print STDERR @_ if ($Debug); @@ -787,7 +787,7 @@ sub _Connect($) require Net::SSH2; $self->{ssh} = Net::SSH2->new(); - $self->{ssh}->debug(1) if ($Debug > 2); + $self->{ssh}->debug(1) if ($Debug > 1); if (!$self->{ssh}->connect($self->{sshfd})) { $self->_SetError($FATAL, "Unable to connect to the SSH server: " . $self->_ssherror());

1 0

Francois Gouget : testbot: Capture the task scripts Perl errors in the task 's generic error log.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: tools Branch: master Commit: 2ca0272e36a7c5b3243c88288105ab044535bd80 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2ca0272e36a7c5b3243c8828… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 12:07:53 2012 +0100 testbot: Capture the task scripts Perl errors in the task's generic error log. Also simplify the fork()+exec() code a bit. --- testbot/lib/WineTestBot/Tasks.pm | 56 +++++++++++++++++++++++++------------- 1 files changed, 37 insertions(+), 19 deletions(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index adba173..79622de 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -80,35 +80,53 @@ sub Run $self->Status("running"); $self->Save(); + my $Job = WineTestBot::Jobs::CreateJobs()->GetItem($JobId); + my $Step = $Job->Steps->GetItem($StepNo); + my $RunScript; + if ($Step->Type eq "build") + { + $RunScript = "RunBuild.pl"; + } + elsif ($Step->Type eq "reconfig") + { + $RunScript = "RunReconfig.pl"; + } + else + { + $RunScript = "RunTask.pl"; + } + $Step = undef; + $Job = undef; + $self->GetBackEnd()->PrepareForFork(); my $Pid = fork; - if (defined($Pid) && ! $Pid) + if (!defined $Pid) { - my $Job = WineTestBot::Jobs::CreateJobs()->GetItem($JobId); - my $Step = $Job->Steps->GetItem($StepNo); - my $RunScript; - if ($Step->Type eq "build") - { - $RunScript = "$BinDir/${ProjectName}RunBuild.pl"; - } - elsif ($Step->Type eq "reconfig") + return "Unable to fork for ${ProjectName}$RunScript: $!"; + } + elsif (!$Pid) + { + # Capture Perl errors in the task's generic error log + my $TaskDir = "$DataDir/jobs/$JobId/$StepNo/" . $self->No; + mkdir $TaskDir; + unlink "$TaskDir/err"; # truncate the log since this is a new run + if (open(STDERR, ">>", "$TaskDir/err")) { - $RunScript = "$BinDir/${ProjectName}RunReconfig.pl"; + # Make sure stderr still flushes after each print + my $tmp=select(STDERR); + $| = 1; + select($tmp); } else { - $RunScript = "$BinDir/${ProjectName}RunTask.pl"; + LogMsg "unable to redirect stderr to '$TaskDir/err'\n"; } - $Step = undef; - $Job = undef; $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; - exec($RunScript, $JobId, $StepNo, $self->No); - exit; - } - if (! defined($Pid)) - { - return "Unable to start child process: $!"; + exec("$BinDir/${ProjectName}$RunScript", $JobId, $StepNo, $self->No) or + require WineTestBot::Log; + WineTestBot::Log::LogMsg "Unable to exec ${ProjectName}$RunScript: $!\n"; + exit(1); } $self->ChildPid($Pid);

1 0

Francois Gouget : testbot: Capture the worker scripts Perl errors in the general log.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: tools Branch: master Commit: 8bcaf6c8510abeb662b0ad0e61232d7c1c2fa432 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8bcaf6c8510abeb662b0ad0e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 12:07:45 2012 +0100 testbot: Capture the worker scripts Perl errors in the general log. Also simplify the fork()+exec() code a bit. --- testbot/bin/Engine.pl | 50 +++++++++++++++++---------------------- testbot/lib/WineTestBot/Log.pm | 18 ++++++++++++++ testbot/lib/WineTestBot/VMs.pm | 17 ++++++++----- 3 files changed, 50 insertions(+), 35 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index a26ac17..e233e80 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -120,18 +120,16 @@ sub HandleJobStatusChange { $ActiveBackEnds{'WineTestBot'}->PrepareForFork(); my $Pid = fork; - if (defined($Pid) && ! $Pid) + if (!defined $Pid) { - exec("$BinDir/${ProjectName}SendLog.pl $JobKey"); + LogMsg "Unable to fork for ${ProjectName}SendLog.pl: $!\n"; } - if (defined($Pid) && ! $Pid) + elsif (!$Pid) { - LogMsg "Unable to exec ${ProjectName}SendLog.pl : $!\n"; - exit; - } - if (! defined($Pid)) - { - LogMsg "Unable to fork for ${ProjectName}SendLog.pl : $!\n"; + WineTestBot::Log::SetupRedirects(); + exec("$BinDir/${ProjectName}SendLog.pl $JobKey") or + LogMsg "Unable to exec ${ProjectName}SendLog.pl: $!\n"; + exit(1); } } @@ -214,18 +212,16 @@ sub CheckForWinetestUpdate $ActiveBackEnds{'WineTestBot'}->PrepareForFork(); my $Pid = fork; - if (defined($Pid) && ! $Pid) - { - exec("$BinDir/CheckForWinetestUpdate.pl $Bits"); - } - if (defined($Pid) && ! $Pid) + if (!defined $Pid) { - LogMsg "Unable to exec CheckForWinetestUpdate.pl : $!\n"; - exit; + LogMsg "Unable to fork for CheckForWinetestUpdate.pl: $!\n"; } - if (! defined($Pid)) + elsif (!$Pid) { - LogMsg "Unable to fork for CheckForWinetestUpdate.pl : $!\n"; + WineTestBot::Log::SetupRedirects(); + exec("$BinDir/CheckForWinetestUpdate.pl $Bits") or + LogMsg "Unable to exec CheckForWinetestUpdate.pl: $!\n"; + exit(1); } } @@ -365,19 +361,17 @@ sub HandleWinePatchWebNotification { $ActiveBackEnds{'WineTestBot'}->PrepareForFork(); my $Pid = fork; - if (defined($Pid) && ! $Pid) + if (!defined $Pid) { - exec("$BinDir/WinePatchesWebGet.pl " . ($MaxExistingWebPatchId + 1) . - " " . $LatestWebPatchId); - } - if (defined($Pid) && ! $Pid) - { - LogMsg "Unable to exec WinePatchesWebGet.pl : $!\n"; - exit; + LogMsg "Unable to fork for WinePatchesWebGet.pl: $!\n"; } - if (! defined($Pid)) + elsif (!$Pid) { - LogMsg "Unable to fork for WinePatchesWebGet.pl : $!\n"; + WineTestBot::Log::SetupRedirects(); + exec("$BinDir/WinePatchesWebGet.pl " . ($MaxExistingWebPatchId + 1) . + " " . $LatestWebPatchId) or + LogMsg "Unable to exec WinePatchesWebGet.pl: $!\n"; + exit(1); } } diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index 102b74d..6982943 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -57,4 +57,22 @@ sub LogMsg(@) print $logfile scalar localtime, " ", $logprefix, ": ", @_ if ($logfile); } +sub SetupRedirects() +{ + if (defined $logfile) + { + if (open(STDERR, ">>&", $logfile)) + { + # Make sure stderr still flushes after each print + my $tmp=select(STDERR); + $| = 1; + select($tmp); + } + else + { + LogMsg "unable to redirect stderr to the log file\n"; + } + } +} + 1; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 82ad379..a42fb12 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -526,16 +526,19 @@ sub RunRevert $self->GetBackEnd()->PrepareForFork(); my $Pid = fork; - if (defined($Pid) && ! $Pid) + if (!defined $Pid) { - $ENV{PATH} = "/usr/bin:/bin"; - delete $ENV{ENV}; - exec("$BinDir/RevertVM.pl", $self->GetKey()); - exit; + return "Unable to start child process: $!"; } - if (! defined($Pid)) + elsif (!$Pid) { - return "Unable to start child process: $!"; + $ENV{PATH} = "/usr/bin:/bin"; + delete $ENV{ENV}; + WineTestBot::Log::SetupRedirects(); + exec("$BinDir/RevertVM.pl", $self->GetKey()) or + require WineTestBot::Log; + WineTestBot::Log::LogMsg "Unable to exec RevertVM.pl: $!\n"; + exit(1); } return undef;

1 0

Francois Gouget : testbot: Allow running the scripts using a relative path.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: tools Branch: master Commit: 1ea3c37de85bc505e9fdd843b7f96facfaca9780 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1ea3c37de85bc505e9fdd843… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Dec 11 12:06:51 2012 +0100 testbot: Allow running the scripts using a relative path. Just make sure to turn it into an absolute path before we use it for the Perl module include path and for the $::RootDir variable. --- testbot/bin/CheckForWinetestUpdate.pl | 8 +++++++- testbot/bin/Engine.pl | 8 +++++++- testbot/bin/Janitor.pl | 8 +++++++- testbot/bin/PingEngine.pl | 8 +++++++- testbot/bin/RevertVM.pl | 8 +++++++- testbot/bin/WinePatchesMLSubmit.pl | 8 +++++++- testbot/bin/WinePatchesWebGet.pl | 8 +++++++- testbot/bin/WinePatchesWebNotify.pl | 8 +++++++- testbot/bin/WineRunBuild.pl | 8 +++++++- testbot/bin/WineRunReconfig.pl | 8 +++++++- testbot/bin/WineRunTask.pl | 8 +++++++- testbot/bin/WineSendLog.pl | 8 +++++++- testbot/bin/build/Build.pl | 8 +++++++- testbot/bin/build/Reconfig.pl | 8 +++++++- testbot/lib/WineTestBot/Config.pm | 8 ++++++++ testbot/scripts/CheckWineTestBot.pl | 8 +++++++- testbot/scripts/TestAgent | 8 +++++++- 17 files changed, 120 insertions(+), 16 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 89c828f..2e28cdc 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -24,7 +24,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index f9be03a..a26ac17 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -22,7 +22,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 57aa172..0c8b77f 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -23,7 +23,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/PingEngine.pl b/testbot/bin/PingEngine.pl index ef43807..2fb1b70 100755 --- a/testbot/bin/PingEngine.pl +++ b/testbot/bin/PingEngine.pl @@ -22,7 +22,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index 8fbc22a..2d8bf71 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -25,7 +25,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index 7ee4ecf..ffc65cb 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -24,7 +24,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/WinePatchesWebGet.pl b/testbot/bin/WinePatchesWebGet.pl index ed84a50..85f7986 100755 --- a/testbot/bin/WinePatchesWebGet.pl +++ b/testbot/bin/WinePatchesWebGet.pl @@ -23,7 +23,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/WinePatchesWebNotify.pl b/testbot/bin/WinePatchesWebNotify.pl index 6940d76..0fd0318 100755 --- a/testbot/bin/WinePatchesWebNotify.pl +++ b/testbot/bin/WinePatchesWebNotify.pl @@ -23,7 +23,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 40c46e4..9fd23a7 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -23,7 +23,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 67bb07b..47ac72e 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -23,7 +23,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index b101aff..8e7aeff 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -22,7 +22,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index b039e2e..04e9009 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -23,7 +23,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index c2e53e6..8ecbd09 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -24,7 +24,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 89296bc..cc8e76e 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -24,7 +24,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 71cf1c6..9a16fe6 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -48,6 +48,14 @@ require Exporter; $JobPurgeDays $JobArchiveDays $WebHostName); @EXPORT_OK = qw($DbDataSource $DbUsername $DbPassword); +if ($::RootDir !~ m=^/=) +{ + require File::Basename; + my $name0 = File::Basename::basename($0); + print STDERR "$name0:error: \$::RootDir must be set to an absolute path\n"; + exit 1; +} + $LogDir = "$::RootDir/var"; $DataDir = "$::RootDir/var"; $BinDir = "$::RootDir/bin"; diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl index b749eff..6415dc3 100755 --- a/testbot/scripts/CheckWineTestBot.pl +++ b/testbot/scripts/CheckWineTestBot.pl @@ -22,7 +22,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib"; diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index db31a3d..b861ba2 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -23,7 +23,13 @@ use strict; sub BEGIN { - if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; unshift @INC, "$::RootDir/lib";

1 0

Detlef Riekenberg : mlang/tests: Accept the different translation in win8.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: cd804dab296da44c1c3214c5a26b9d999e710c57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd804dab296da44c1c3214c5a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Dec 10 11:49:48 2012 +0100 mlang/tests: Accept the different translation in win8. --- dlls/mlang/tests/mlang.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index fb37e27..0da31b5 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -121,6 +121,9 @@ static const WCHAR de_engb2[] ={'E','n','g','l','i','s','c','h',' ', 'K',0xF6,'n','i','g','r','e','i','c',0}; static const WCHAR de_enus[] = {'E','n','g','l','i','s','c','h',' ', '(','U','S','A',')',0}; +static const WCHAR de_enus2[] ={'E','n','g','l','i','s','c','h',' ', + '(','V','e','r','e','i','n','i','g','t','e',' ', + 'S','t','a','a','t','e','n',')',0}; static const WCHAR de_de[] = {'D','e','u','t','s','c','h',' ', '(','D','e','u','t','s','c','h','l','a','n','d',')',0}; static const WCHAR de_deat[] = {'D','e','u','t','s','c','h',' ', @@ -184,11 +187,11 @@ static const info_table_entry info_table[] = { {MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), TODO_NAME, "en", de_en}, {MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), - TODO_NAME, "en-us", de_enus}, + TODO_NAME, "en-us", de_enus, de_enus2}, {MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_UK), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), TODO_NAME, "en-gb", de_engb, de_engb2}, {MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), - TODO_NAME, "en-us", de_enus}, + TODO_NAME, "en-us", de_enus, de_enus2}, {MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_CAN), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), TODO_NAME, "en-ca", de_enca},

1 0

Alexandre Julliard : winex11: Send WM_EXITSIZEMOVE when the mouse has been released.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: ed47a507d0ec9b1d5771ea86b4b7fb2be3ef1bd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed47a507d0ec9b1d5771ea86b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 10 20:30:20 2012 +0100 winex11: Send WM_EXITSIZEMOVE when the mouse has been released. --- dlls/winex11.drv/mouse.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 818bdd5..47a453c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1384,6 +1384,7 @@ void move_resize_window( HWND hwnd, int dir ) } TRACE( "hwnd %p/%lx done\n", hwnd, win ); + SendMessageW( hwnd, WM_EXITSIZEMOVE, 0, 0 ); }

1 0

Jacek Caban : atl: Don't call HeapFree on module argument in AtlModuleTerm.
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: 9f03c865b390ad3a67c8221dd45524d6bde4421b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f03c865b390ad3a67c8221dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 10 12:35:33 2012 +0100 atl: Don't call HeapFree on module argument in AtlModuleTerm. --- dlls/atl/atl_main.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index eee6fee..415fbc3 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -132,7 +132,7 @@ HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex, return S_OK; } -HRESULT WINAPI AtlModuleTerm(_ATL_MODULEW* pM) +HRESULT WINAPI AtlModuleTerm(_ATL_MODULE *pM) { _ATL_TERMFUNC_ELEM *iter = pM->m_pTermFuncs, *tmp; @@ -145,8 +145,6 @@ HRESULT WINAPI AtlModuleTerm(_ATL_MODULEW* pM) HeapFree(GetProcessHeap(), 0, tmp); } - HeapFree(GetProcessHeap(), 0, pM); - return S_OK; }

1 0

Jacek Caban : atl100: Added AtlCallTermFunc implementation ( based on AtlModuleTerm).
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: 0a0b2ff01983e040285028d3ec2987b75214d285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a0b2ff01983e040285028d3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 10 12:27:47 2012 +0100 atl100: Added AtlCallTermFunc implementation (based on AtlModuleTerm). --- dlls/atl100/atl.c | 19 +++++++++++++++++++ dlls/atl100/atl100.spec | 2 +- dlls/atl80/atl80.spec | 2 +- include/atlbase.h | 1 + 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 69a6e9e..dd08867 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -246,6 +246,25 @@ HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD } /*********************************************************************** + * AtlCallTermFunc [atl100.@] + */ +void WINAPI AtlCallTermFunc(_ATL_MODULE *pM) +{ + _ATL_TERMFUNC_ELEM *iter = pM->m_pTermFuncs, *tmp; + + TRACE("(%p)\n", pM); + + while(iter) { + iter->pFunc(iter->dw); + tmp = iter; + iter = iter->pNext; + HeapFree(GetProcessHeap(), 0, tmp); + } + + pM->m_pTermFuncs = NULL; +} + +/*********************************************************************** * AtlGetVersion [atl100.@] */ DWORD WINAPI AtlGetVersion(void *pReserved) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 7ba8154..47e3c56 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -45,7 +45,7 @@ 61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA -64 stub AtlCallTermFunc +64 stdcall AtlCallTermFunc(ptr) 65 stub AtlWinModuleInit 66 stub AtlWinModuleTerm 67 stub AtlSetPerUserRegistration diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index c674ed2..6756776 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -51,6 +51,6 @@ 61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar 62 stub AltWinModuleRegisterClassExW 63 stub AltWinModuleRegisterClassExA -64 stub AltCallTermFunc +64 stdcall AltCallTermFunc(ptr) atl100.AltCallTermFunc 65 stub AltWinModuleInit 66 stub AltWinModuleTerm diff --git a/include/atlbase.h b/include/atlbase.h index fbf1479..1e48f58 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -196,6 +196,7 @@ HRESULT WINAPI AtlInternalQueryInterface(void* pThis, const _ATL_INTMAP_ENTRY* p HRESULT WINAPI AtlMarshalPtrInProc(IUnknown *pUnk, const IID *iid, IStream **ppStream); void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, void* pvObject); HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw); +void WINAPI AtlCallTermFunc(_ATL_MODULE*); void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM); HRESULT WINAPI AtlModuleInit(_ATL_MODULEW* pM, _ATL_OBJMAP_ENTRYW* p, HINSTANCE h); HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex, BSTR *pbstrPath, ITypeLib **ppTypeLib);

1 0

Jacek Caban : atl100: Added AtlAddTermFunc implementation (based on atl. dll version).
by Alexandre Julliard 10 Dec '12

10 Dec '12

Module: wine Branch: master Commit: 264f6dfe14d40e15b1acc196e8fcb307813f483f URL: http://source.winehq.org/git/wine.git/?a=commit;h=264f6dfe14d40e15b1acc196e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 10 12:27:29 2012 +0100 atl100: Added AtlAddTermFunc implementation (based on atl.dll version). --- dlls/atl100/atl.c | 21 ++++++++++++++++++++- dlls/atl100/atl100.spec | 2 +- dlls/atl80/atl80.spec | 2 +- include/atlbase.h | 2 +- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 88cdce4..69a6e9e 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -22,7 +22,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(atl); +WINE_DEFAULT_DEBUG_CHANNEL(atl100); /*********************************************************************** * AtlAdvise [atl100.@] @@ -227,6 +227,25 @@ HRESULT WINAPI AtlIPersistStreamInit_Save(LPSTREAM pStm, BOOL fClearDirty, } /*********************************************************************** + * AtlModuleAddTermFunc [atl100.@] + */ +HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw) +{ + _ATL_TERMFUNC_ELEM *termfunc_elem; + + TRACE("(%p %p %ld)\n", pM, pFunc, dw); + + termfunc_elem = HeapAlloc(GetProcessHeap(), 0, sizeof(_ATL_TERMFUNC_ELEM)); + termfunc_elem->pFunc = pFunc; + termfunc_elem->dw = dw; + termfunc_elem->pNext = pM->m_pTermFuncs; + + pM->m_pTermFuncs = termfunc_elem; + + return S_OK; +} + +/*********************************************************************** * AtlGetVersion [atl100.@] */ DWORD WINAPI AtlGetVersion(void *pReserved) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index efe6c19..7ba8154 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -39,7 +39,7 @@ 53 stub AtlIPersistPropertyBag_Save 54 stub AtlGetObjectSourceInterface 56 stub AtlLoadTypeLib -58 stub AtlModuleAddTermFunc +58 stdcall AtlModuleAddTermFunc(ptr ptr long) 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx 61 stdcall AtlCreateRegistrar(ptr) diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 519bdd0..c674ed2 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -45,7 +45,7 @@ 55 stub AtlModuleUnRegisterTypeLib 56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) atl.AtlModuleLoadTypeLib 57 stdcall AtlModuleUnregisterServerEx(ptr long ptr) atl.AtlModuleUnregisterServerEx -58 stdcall AtlModuleAddTermFunc(ptr) atl.AtlModuleAddTermFunc # don't forward to atl100.dll +58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl100.AtlModuleAddTermFunc 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx 61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar diff --git a/include/atlbase.h b/include/atlbase.h index 794a099..fbf1479 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -195,7 +195,7 @@ HRESULT WINAPI AtlFreeMarshalStream(IStream *pStream); HRESULT WINAPI AtlInternalQueryInterface(void* pThis, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, void** ppvObject); HRESULT WINAPI AtlMarshalPtrInProc(IUnknown *pUnk, const IID *iid, IStream **ppStream); void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, void* pvObject); -HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULEW *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw); +HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw); void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM); HRESULT WINAPI AtlModuleInit(_ATL_MODULEW* pM, _ATL_OBJMAP_ENTRYW* p, HINSTANCE h); HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex, BSTR *pbstrPath, ITypeLib **ppTypeLib);

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2012