September 2012 - Wine-commits

Francois Gouget : testbot/lib: Add a CombineKey() method for use with GetItem().
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: tools Branch: master Commit: 8fd856d8344e257751469c00277fcb1a33a1afea URL: http://source.winehq.org/git/tools.git/?a=commit;h=8fd856d8344e257751469c00… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 4 00:11:52 2012 +0200 testbot/lib: Add a CombineKey() method for use with GetItem(). This way we don't need to build a dummy object just to be able to compute the string to use for GetItem(). This also provides symmetry with SplitKey(). --- testbot/lib/ObjectModel/Collection.pm | 8 ++++++++ testbot/lib/WineTestBot/PendingPatchSets.pm | 8 +------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 9ca2503..3d7f78c 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -236,6 +236,14 @@ sub IsEmpty return scalar(keys %{$self->{Items}}) == 0; } +sub CombineKey +{ + my $self = shift; + + my $CombinedKey = join("#@#", @_); + return $CombinedKey; +} + sub SplitKey { my $self = shift; diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 998c9d3..1a6b9e5 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -230,13 +230,7 @@ sub NewSubmission my $PartNo = int($1); my $MaxPartNo = int($2); - my $DummySet = CreatePendingPatchSets()->Add(); - $DummySet->EMail($Patch->FromEMail); - $DummySet->TotalParts($MaxPartNo); - my $SetKey = $DummySet->GetKey(); - $DummySet = undef; - - my $Set = $self->GetItem($SetKey); + my $Set = $self->GetItem($self->CombineKey($Patch->FromEMail, $MaxPartNo)); if (! defined($Set)) { $Set = $self->Add();

1 0

Francois Gouget : testbot/lib: Remove a duplicate $WineTestBot::Config:: WebHostName definition.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: tools Branch: master Commit: a86f04cb1e98d25c22b021c1302c36af193c53ef URL: http://source.winehq.org/git/tools.git/?a=commit;h=a86f04cb1e98d25c22b021c1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 4 00:11:59 2012 +0200 testbot/lib: Remove a duplicate $WineTestBot::Config::WebHostName definition. $WineTestBot::Config::WebHostName must be set in ConfigLocalTemplate.pl anyway. --- testbot/lib/WineTestBot/Config.pm | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 5a164ea..c7b28b1 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -67,8 +67,6 @@ $ProjectName = "Wine"; $PatchesMailingList = "wine-patches"; $PatchResultsEMail = undef; -$WebHostName = undef; - $LDAPServer = undef; $LDAPBindDN = undef; $LDAPSearchBase = undef;

1 0

Francois Gouget : testbot/lib: Move the $PatchResultsEMail to ConfigLocalTemplate.pl.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: tools Branch: master Commit: 6043cb66d6ee568983472fdba39bfa14741bfa3c URL: http://source.winehq.org/git/tools.git/?a=commit;h=6043cb66d6ee568983472fdb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 4 00:12:30 2012 +0200 testbot/lib: Move the $PatchResultsEMail to ConfigLocalTemplate.pl. It must be changed for integration with Wine's Patches website and thus should not have to be set in a checked-in file. --- testbot/lib/WineTestBot/Config.pm | 1 - testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 4 ++++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index c7b28b1..4299b32 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -65,7 +65,6 @@ $OverheadTimeout = 3 * 60; $ProjectName = "Wine"; $PatchesMailingList = "wine-patches"; -$PatchResultsEMail = undef; $LDAPServer = undef; $LDAPBindDN = undef; diff --git a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl index 8ae54f4..bb7684a 100644 --- a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl +++ b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl @@ -62,6 +62,10 @@ $WineTestBot::Config::AdminEMail = undef; # From address of mails sent by WineTestBot to users $WineTestBot::Config::RobotEMail = undef; +# Email address to send the results to for integration with the Wine Patches +# site +$WineTestBot::Config::PatchResultsEMail = undef; + # Host name of the web interface $WineTestBot::Config::WebHostName = undef;

1 0

Francois Gouget : testbot/bin: Make sure WineSendLog does not spam anyone by default.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: tools Branch: master Commit: 0d513c4a3f63b4401dc1a2f2924d0e7e43eeae3b URL: http://source.winehq.org/git/tools.git/?a=commit;h=0d513c4a3f63b4401dc1a2f2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 4 00:12:38 2012 +0200 testbot/bin: Make sure WineSendLog does not spam anyone by default. This adds a $WinePatchToOverride configuration option and sets it to the WineTestBot administrator email address by default. So as the name implies any test result will be sent to him instead of to the patch authors until he decides the WineTestBot to be worthy. This also adds a $WinePatchCc configuration option to set who should be CC-ed the results. By default this is empty. --- testbot/bin/WineSendLog.pl | 4 ++-- testbot/lib/WineTestBot/Config.pm | 6 ++++-- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 11 ++++++++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index c4147a6..c8c2dce 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -173,7 +173,7 @@ sub CompareLogs sub SendLog { my $Job = shift; - my $To = $Job->GetEMailRecipient(); + my $To = $WinePatchToOverride || $Job->GetEMailRecipient(); if (! defined($To)) { return; @@ -420,7 +420,7 @@ EOF open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL "From: Marvin <$RobotEMail>\n"; print SENDMAIL "To: $To\n"; - print SENDMAIL "Cc: wine-devel\(a)winehq.org\n"; + print SENDMAIL "Cc: $WinePatchCc\n"; print SENDMAIL "Subject: Re: ", $Job->Patch->Subject, "\n"; print SENDMAIL <<"EOF"; diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 4299b32..df40a0c 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -28,7 +28,8 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $VixHostType $VixHostUsername $VixHostPassword $VixGuestUsername $VixGuestPassword $DbDataSource $DbUsername $DbPassword $MaxRevertingVMs $MaxRunningVMs $MaxExtraPoweredOnVms $SleepAfterRevert - $AdminEMail $RobotEMail $SuiteTimeout $SingleTimeout + $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc + $SuiteTimeout $SingleTimeout $BuildTimeout $ReconfigTimeout $OverheadTimeout $TagPrefix $ProjectName $PatchesMailingList $PatchResultsEMail $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter @@ -40,7 +41,8 @@ require Exporter; @EXPORT = qw($UseSSL $LogDir $DataDir $BinDir $VixHostType $VixHostUsername $VixHostPassword $VixGuestUsername $VixGuestPassword $MaxRevertingVMs $MaxRunningVMs $MaxExtraPoweredOnVms - $SleepAfterRevert $AdminEMail $RobotEMail $SuiteTimeout + $SleepAfterRevert $AdminEMail $RobotEMail $WinePatchToOverride + $WinePatchCc $SuiteTimeout $SingleTimeout $BuildTimeout $ReconfigTimeout $OverheadTimeout $TagPrefix $ProjectName $PatchesMailingList $PatchResultsEMail $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter diff --git a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl index bb7684a..9469784 100644 --- a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl +++ b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl @@ -62,8 +62,17 @@ $WineTestBot::Config::AdminEMail = undef; # From address of mails sent by WineTestBot to users $WineTestBot::Config::RobotEMail = undef; +# If set, sends the results to the specified email address instead of the +# patch author. Set it to undef once your WineTestBot installation works and +# 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. +$WineTestBot::Config::WinePatchCc = ""; + # Email address to send the results to for integration with the Wine Patches -# site +# web site $WineTestBot::Config::PatchResultsEMail = undef; # Host name of the web interface

1 0

Francois Gouget : testbot/windows: Move the Windows binaries to bin/windows .
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: tools Branch: master Commit: 149963d89f2cd18112b489894d6d8055cebe79f9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=149963d89f2cd18112b48989… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 4 00:12:21 2012 +0200 testbot/windows: Move the Windows binaries to bin/windows. They are not meant to be run on the server so this cleans up the bin directory. --- testbot/bin/WineRunTask.pl | 4 ++-- testbot/bin/{ => windows}/GenFixEnv.exe | Bin 7680 -> 7680 bytes testbot/bin/{ => windows}/TestLauncher32.exe | Bin 432844 -> 432844 bytes testbot/bin/{ => windows}/TestLauncher64.exe | Bin 115348 -> 115348 bytes testbot/src/GenFixEnv/Makefile | 2 +- testbot/src/TestLauncher/Makefile | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 6db920c..836dab2 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -264,14 +264,14 @@ if (defined($ErrMessage)) my $TestLauncher = "TestLauncher" . ($FileType eq "exe64" ? "64" : "32") . ".exe"; -$ErrMessage = $VM->CopyFileFromHostToGuest("$BinDir/$TestLauncher", +$ErrMessage = $VM->CopyFileFromHostToGuest("$BinDir/windows/$TestLauncher", "C:\\winetest\\$TestLauncher"); if (defined($ErrMessage)) { FatalError "Can't copy TestLauncher to VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -$ErrMessage = $VM->CopyFileFromHostToGuest("$BinDir/GenFixEnv.exe", +$ErrMessage = $VM->CopyFileFromHostToGuest("$BinDir/windows/GenFixEnv.exe", "C:\\winetest\\GenFixEnv.exe"); if (defined($ErrMessage)) { diff --git a/testbot/bin/GenFixEnv.exe b/testbot/bin/windows/GenFixEnv.exe similarity index 100% rename from testbot/bin/GenFixEnv.exe rename to testbot/bin/windows/GenFixEnv.exe diff --git a/testbot/bin/TestLauncher32.exe b/testbot/bin/windows/TestLauncher32.exe similarity index 100% rename from testbot/bin/TestLauncher32.exe rename to testbot/bin/windows/TestLauncher32.exe diff --git a/testbot/bin/TestLauncher64.exe b/testbot/bin/windows/TestLauncher64.exe similarity index 100% rename from testbot/bin/TestLauncher64.exe rename to testbot/bin/windows/TestLauncher64.exe diff --git a/testbot/src/GenFixEnv/Makefile b/testbot/src/GenFixEnv/Makefile index c80a5c3..30c34b9 100644 --- a/testbot/src/GenFixEnv/Makefile +++ b/testbot/src/GenFixEnv/Makefile @@ -1,4 +1,4 @@ -bindir = ../../bin +bindir = ../../bin/windows CROSSCC32 = i686-w64-mingw32-gcc CROSSSTRIP32 = i686-w64-mingw32-strip diff --git a/testbot/src/TestLauncher/Makefile b/testbot/src/TestLauncher/Makefile index 822aef7..2b1dfaa 100644 --- a/testbot/src/TestLauncher/Makefile +++ b/testbot/src/TestLauncher/Makefile @@ -1,4 +1,4 @@ -bindir = ../../bin +bindir = ../../bin/windows CROSSCC32 = i686-w64-mingw32-gcc CROSSSTRIP32 = i686-w64-mingw32-strip

1 0

Francois Gouget : testbot/doc: Flesh out the perlpod documentation.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: tools Branch: master Commit: 0cf8feb50c3c174bb767f4432cdb445003f80af3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0cf8feb50c3c174bb767f443… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 4 00:11:08 2012 +0200 testbot/doc: Flesh out the perlpod documentation. Also fix many documentation copy/paste issues. --- testbot/bin/WinePatchesHandler.pl | 4 +- testbot/lib/ObjectModel/BackEnd.pm | 11 +- testbot/lib/ObjectModel/BasicPropertyDescriptor.pm | 9 +- testbot/lib/ObjectModel/Collection.pm | 17 +++- testbot/lib/ObjectModel/DBIBackEnd.pm | 10 ++ .../lib/ObjectModel/DetailrefPropertyDescriptor.pm | 8 +- testbot/lib/ObjectModel/EnumPropertyDescriptor.pm | 12 ++- testbot/lib/ObjectModel/Item.pm | 6 +- .../lib/ObjectModel/ItemrefPropertyDescriptor.pm | 8 +- testbot/lib/ObjectModel/PropertyDescriptor.pm | 13 ++- testbot/lib/WineTestBot/Branches.pm | 15 ++- testbot/lib/WineTestBot/Config.pm | 8 +- testbot/lib/WineTestBot/Jobs.pm | 70 +++++++++++++- testbot/lib/WineTestBot/Log.pm | 6 +- testbot/lib/WineTestBot/Patches.pm | 63 ++++++++++++- testbot/lib/WineTestBot/PendingPatchSets.pm | 97 +++++++++++++++++++- testbot/lib/WineTestBot/PendingPatches.pm | 20 +++- testbot/lib/WineTestBot/Roles.pm | 18 +++- testbot/lib/WineTestBot/Steps.pm | 20 +++- testbot/lib/WineTestBot/StepsTasks.pm | 20 +++- testbot/lib/WineTestBot/Tasks.pm | 36 ++++++- testbot/lib/WineTestBot/UserRoles.pm | 14 ++- testbot/lib/WineTestBot/Users.pm | 14 ++- testbot/lib/WineTestBot/Utils.pm | 6 +- testbot/lib/WineTestBot/WineTestBotObjects.pm | 15 ++- 25 files changed, 411 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=0cf8feb50c3c174bb767…

1 0

Francois Gouget : testbot/bin: Document the purpose of the scripts.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: tools Branch: master Commit: d5fff860f06bf717b92431e919caba05882c7b4d URL: http://source.winehq.org/git/tools.git/?a=commit;h=d5fff860f06bf717b92431e9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 4 00:11:16 2012 +0200 testbot/bin: Document the purpose of the scripts. --- testbot/bin/BuildSingleTest.pl | 4 ++++ testbot/bin/CheckForWinetestUpdate.pl | 4 ++++ testbot/bin/Engine.pl | 18 +++++++++++++++++- testbot/bin/Janitor.pl | 5 ++--- testbot/bin/PatchNotificationHandler.pl | 3 ++- testbot/bin/PingEngine.pl | 2 +- testbot/bin/Reconfig.pl | 4 ++++ testbot/bin/RetrievePatches.pl | 3 +++ testbot/bin/RevertVM.pl | 5 +++++ testbot/bin/WineRunBuild.pl | 3 +++ testbot/bin/WineRunReconfig.pl | 3 +++ testbot/bin/WineRunTask.pl | 2 ++ testbot/bin/WineSendLog.pl | 3 ++- 13 files changed, 52 insertions(+), 7 deletions(-) diff --git a/testbot/bin/BuildSingleTest.pl b/testbot/bin/BuildSingleTest.pl index d2b0d99..8018679 100755 --- a/testbot/bin/BuildSingleTest.pl +++ b/testbot/bin/BuildSingleTest.pl @@ -1,5 +1,9 @@ #!/usr/bin/perl -Tw # +# Performs the 'build' task in the build machine. Specifically this applies a +# conformance test patch, rebuilds the impacted test and retrieves the +# resulting 32 and 64 bit binaries. +# # Copyright 2009 Ge van Geldorp # # This library is free software; you can redistribute it and/or diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 7755754..5285d89 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -1,5 +1,9 @@ #!/usr/bin/perl -Tw # +# Checks if a new winetest binary is available on http://test.winehq.org/data/. +# If so, triggers an update of the build VM to the latest Wine source and +# runs the full test suite on the standard Windows test VMs. +# # Copyright 2009 Ge van Geldorp # # This library is free software; you can redistribute it and/or diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 422e810..947c24c 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# WineTestBot engine +# The WineTestBot server, aka the engine that makes it all work. # # Copyright 2009 Ge van Geldorp # @@ -528,6 +528,22 @@ sub InitVMs() } } +=pod +=over 12 + +=item C<SafetyNet()> + +This is called on startup and regularly after that to catch thing that fall +through the cracks, possibly because of an Engine restart. +Specifically it updates the status of all the current Jobs, Steps and +Tasks, then schedules Tasks to be run, checks the staging directory for +wine-patches emails dropped by WinePatchesHandler.pl, for notifications of +changes on Wine's Patches web site dropped by PatchNotificationHandler.pl, and +checks whether any pending patchsets are now complete and thus can be scheduled. + +=back +=cut + sub SafetyNet { my $Jobs = CreateJobs(); diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index c4ad4cd..033bd5d 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -1,8 +1,7 @@ #!/usr/bin/perl -Tw # -# Janitorial tasks -# Run this from crontab once per day, e.g. -# 17 1 * * * /usr/lib/winetestbot/bin/Janitor.pl +# This script performs janitorial tasks. It removes incomplete patch series, +# archives old jobs and purges older jobs and patches. # # Copyright 2009 Ge van Geldorp # diff --git a/testbot/bin/PatchNotificationHandler.pl b/testbot/bin/PatchNotificationHandler.pl index 84ccf87..81cd376 100755 --- a/testbot/bin/PatchNotificationHandler.pl +++ b/testbot/bin/PatchNotificationHandler.pl @@ -1,6 +1,7 @@ #!/usr/bin/perl -Tw # -# Tell the engine to expect a winetest.exe update on test.winehq.org +# Notifies WineTestBot that there are new patches to test on +# http://source.winehq.org/patches. # # Copyright 2009 Ge van Geldorp # diff --git a/testbot/bin/PingEngine.pl b/testbot/bin/PingEngine.pl index 6f2581b..4faddf6 100755 --- a/testbot/bin/PingEngine.pl +++ b/testbot/bin/PingEngine.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# Ping WineTestBot engine to see if it is alive +# Pings the WineTestBot engine to see if it is still alive. # # Copyright 2009 Ge van Geldorp # diff --git a/testbot/bin/Reconfig.pl b/testbot/bin/Reconfig.pl index c5308f4..aecc6a3 100755 --- a/testbot/bin/Reconfig.pl +++ b/testbot/bin/Reconfig.pl @@ -1,5 +1,9 @@ #!/usr/bin/perl -Tw # +# Performs the 'reconfig' task in the build machine. Specifically this updates +# the build machine's Wine repository, re-runs configure, and rebuilds the +# 32 and 64 bit winetest binaries. +# # Copyright 2009 Ge van Geldorp # # This library is free software; you can redistribute it and/or diff --git a/testbot/bin/RetrievePatches.pl b/testbot/bin/RetrievePatches.pl index c0f17c8..18b3aa7 100755 --- a/testbot/bin/RetrievePatches.pl +++ b/testbot/bin/RetrievePatches.pl @@ -1,5 +1,8 @@ #!/usr/bin/perl -Tw # +# Retrieve the latest patches from http://source.winehq.org/patches and submit +# them for testing. See also PatchNotificationHandler.pl. +# # Copyright 2009 Ge van Geldorp # # This library is free software; you can redistribute it and/or diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index 4d7b64f..c62d498 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -1,5 +1,10 @@ #!/usr/bin/perl -Tw # +# Reverts a VM so that it is ready to run jobs. Note that in addition to the +# hypervisor revert operation this implies letting the VM settle down and +# checking that it responds to our commands. If this fails the administrator +# is notified and the VM is marked as offline. +# # Copyright 2009 Ge van Geldorp # # This library is free software; you can redistribute it and/or diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index d11d4bf..2699351 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -1,5 +1,8 @@ #!/usr/bin/perl -Tw # +# Communicates with the build machine to have it perform the 'build' task. +# See the bin/BuildSingleTest.pl script. +# # Copyright 2009 Ge van Geldorp # # This library is free software; you can redistribute it and/or diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 3a02a9e..4aacd81 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -1,5 +1,8 @@ #!/usr/bin/perl -Tw # +# Communicates with the build machine to have it perform the 'reconfig' task. +# See the bin/Reconfig.pl script. +# # Copyright 2009 Ge van Geldorp # # This library is free software; you can redistribute it and/or diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 71cc9f5..6db920c 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -1,5 +1,7 @@ #!/usr/bin/perl -Tw # +# Sends and runs the tasks in the Windows test VMs. +# # Copyright 2009 Ge van Geldorp # # This library is free software; you can redistribute it and/or diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 1f92083..c4147a6 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -1,6 +1,7 @@ #!/usr/bin/perl -Tw # -# Send job log to submitting user +# Sends the job log to the submitting user and informs the Wine Patches web +# site of the test results. # # Copyright 2009 Ge van Geldorp #

1 0

Francois Gouget : testbot/lib: Don' t force the build VM to have a ConfigLocal.pm file and a DBI perl module.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: tools Branch: master Commit: 5c821ecb546d91b6cdbf810e192c6549a4f344d2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=5c821ecb546d91b6cdbf810e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 4 00:11:28 2012 +0200 testbot/lib: Don't force the build VM to have a ConfigLocal.pm file and a DBI perl module. Neither are needed for the build VM. --- testbot/bin/BuildSingleTest.pl | 1 + testbot/bin/Reconfig.pl | 1 + testbot/lib/WineTestBot/Config.pm | 25 ++++++++++++++----------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/testbot/bin/BuildSingleTest.pl b/testbot/bin/BuildSingleTest.pl index 8018679..52ff8ba 100755 --- a/testbot/bin/BuildSingleTest.pl +++ b/testbot/bin/BuildSingleTest.pl @@ -25,6 +25,7 @@ use strict; my $Dir; sub BEGIN { + $main::BuildEnv = 1; $0 =~ m=^(.*)/[^/]*$=; $Dir = $1; } diff --git a/testbot/bin/Reconfig.pl b/testbot/bin/Reconfig.pl index aecc6a3..f72ba6c 100755 --- a/testbot/bin/Reconfig.pl +++ b/testbot/bin/Reconfig.pl @@ -25,6 +25,7 @@ use strict; my $Dir; sub BEGIN { + $main::BuildEnv = 1; $0 =~ m=^(.*)/[^/]*$=; $Dir = $1; } diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index a29f99c..5a164ea 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -24,8 +24,6 @@ WineTestBot::Config - Site-independent configuration settings =cut -use ObjectModel::DBIBackEnd; - use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $VixHostType $VixHostUsername $VixHostPassword $VixGuestUsername $VixGuestPassword $DbDataSource $DbUsername @@ -81,18 +79,23 @@ $LDAPEMailAttribute = undef; $JobPurgeDays = 7; $JobArchiveDays = 0; -eval 'require "WineTestBot/ConfigLocal.pl";'; -if ($@) +if (!$main::BuildEnv) { - print STDERR "Please create a valid lib/WineTestBot/ConfigLocal.pl, use " . - "lib/WineTestBot/ConfigLocalTemplate.pl as template\n"; - exit; + $main::BuildEnv = 0; + eval 'require "WineTestBot/ConfigLocal.pl";'; + if ($@) + { + print STDERR "Please create a valid lib/WineTestBot/ConfigLocal.pl, " . + "use lib/WineTestBot/ConfigLocalTemplate.pl as template\n"; + exit; + } + + require ObjectModel::DBIBackEnd; + ObjectModel::DBIBackEnd->UseDBIBackEnd('WineTestBot', $DbDataSource, + $DbUsername, $DbPassword, + { RaiseError => 1 }); } -ObjectModel::DBIBackEnd->UseDBIBackEnd('WineTestBot', $DbDataSource, - $DbUsername, $DbPassword, - { RaiseError => 1 }); - umask 002; 1;

1 0

Piotr Caban : kernel32: Added GetLogicalProcessorInformation implementation .
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: c6ac0d0fcc57b4b955289826e2effb759f74e673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ac0d0fcc57b4b955289826e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 4 13:39:52 2012 +0200 kernel32: Added GetLogicalProcessorInformation implementation. --- dlls/kernel32/process.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1edf9ea..1b10f9e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3717,9 +3717,29 @@ HANDLE WINAPI GetCurrentProcess(void) */ BOOL WINAPI GetLogicalProcessorInformation(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION buffer, PDWORD pBufLen) { - FIXME("(%p,%p): stub\n", buffer, pBufLen); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + NTSTATUS status; + + TRACE("(%p,%p)\n", buffer, pBufLen); + + if(!pBufLen) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + status = NtQuerySystemInformation( SystemLogicalProcessorInformation, buffer, *pBufLen, pBufLen); + + if (status == STATUS_INFO_LENGTH_MISMATCH) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } + return TRUE; } /***********************************************************************

1 0

Dmitry Timoshkov : gdiplus: Add support for StringFormatFlagsNoClip.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: bfa35f37a7687cdae338ad9837fc595afb2df2b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa35f37a7687cdae338ad983… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 3 17:56:12 2012 +0900 gdiplus: Add support for StringFormatFlagsNoClip. --- dlls/gdiplus/graphics.c | 33 ++++++++++++++++++++++++++++----- 1 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 640603a..96e2533 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4977,8 +4977,16 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, scaled_rect.X = (layoutRect->X + margin_x) * args.rel_width; scaled_rect.Y = layoutRect->Y * args.rel_height; - scaled_rect.Width = layoutRect->Width * args.rel_width; - scaled_rect.Height = layoutRect->Height * args.rel_height; + if (stringFormat->attr & StringFormatFlagsNoClip) + { + scaled_rect.Width = (REAL)(1 << 23); + scaled_rect.Height = (REAL)(1 << 23); + } + else + { + scaled_rect.Width = layoutRect->Width * args.rel_width; + scaled_rect.Height = layoutRect->Height * args.rel_height; + } if (scaled_rect.Width >= 0.5) { scaled_rect.Width -= margin_x * 2.0 * args.rel_width; @@ -5058,7 +5066,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, GpPointF pt[3]; RectF scaled_rect; REAL margin_x; - INT lines, glyphs; + INT lines, glyphs, format_flags = format ? format->attr : 0; TRACE("(%p, %s, %i, %p, %s, %p, %p, %p, %p)\n", graphics, debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, @@ -5100,6 +5108,12 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, scaled_rect.Y = rect->Y * args.rel_height; scaled_rect.Width = rect->Width * args.rel_width; scaled_rect.Height = rect->Height * args.rel_height; + + if ((format_flags & StringFormatFlagsNoClip) || + scaled_rect.Width >= INT_MAX || scaled_rect.Width < 0.5) scaled_rect.Width = (REAL)(1 << 23); + if ((format_flags & StringFormatFlagsNoClip) || + scaled_rect.Height >= INT_MAX || scaled_rect.Height < 0.5) scaled_rect.Height = (REAL)(1 << 23); + if (scaled_rect.Width >= 0.5) { scaled_rect.Width -= margin_x * 2.0 * args.rel_width; @@ -5202,7 +5216,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string GpPointF pt[3], rectcpy[4]; POINT corners[4]; REAL rel_width, rel_height, margin_x; - INT save_state; + INT save_state, format_flags = 0; REAL offsety = 0.0; struct draw_string_args args; RectF scaled_rect; @@ -5227,6 +5241,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if(format){ TRACE("may be ignoring some format flags: attr %x\n", format->attr); + format_flags = format->attr; + /* Should be no need to explicitly test for StringAlignmentNear as * that is default behavior if no alignment is passed. */ if(format->vertalign != StringAlignmentNear){ @@ -5271,6 +5287,12 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string scaled_rect.Y = 0.0; scaled_rect.Width = rel_width * rect->Width; scaled_rect.Height = rel_height * rect->Height; + + if ((format_flags & StringFormatFlagsNoClip) || + scaled_rect.Width >= INT_MAX || scaled_rect.Width < 0.5) scaled_rect.Width = (REAL)(1 << 23); + if ((format_flags & StringFormatFlagsNoClip) || + scaled_rect.Height >= INT_MAX || scaled_rect.Height < 0.5) scaled_rect.Height = (REAL)(1 << 23); + if (scaled_rect.Width >= 0.5) { scaled_rect.Width -= margin_x * 2.0 * rel_width; @@ -5280,7 +5302,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if (scaled_rect.Width >= INT_MAX || scaled_rect.Width < 0.5) scaled_rect.Width = (REAL)(1 << 23); if (scaled_rect.Height >= INT_MAX || scaled_rect.Height < 0.5) scaled_rect.Height = (REAL)(1 << 23); - if (gdip_round(scaled_rect.Width) != 0 && gdip_round(scaled_rect.Height) != 0) + if (!(format_flags & StringFormatFlagsNoClip) && + gdip_round(scaled_rect.Width) != 0 && gdip_round(scaled_rect.Height) != 0) { /* FIXME: If only the width or only the height is 0, we should probably still clip */ rgn = CreatePolygonRgn(corners, 4, ALTERNATE);

1 0