wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

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/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/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/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: 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: 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

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/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

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: ed68b6d1203323c93e65778094e47516cf49416f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed68b6d1203323c93e6577809… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Sep 4 23:26:30 2012 +0900 po: Update Japanese translation. --- po/ja.po | 65 +++++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 44 insertions(+), 21 deletions(-) diff --git a/po/ja.po b/po/ja.po index 2e42e51..69b1dd6 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-06-07 00:10+0900\n" +"PO-Revision-Date: 2012-09-04 23:19+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: none\n" "Language: Japanese\n" @@ -637,7 +637,7 @@ msgstr "大文字と小文字を区別する(&C)" #: comdlg32.rc:317 joy.rc:68 msgid "Direction" -msgstr "検索する方向" +msgstr "方向" #: comdlg32.rc:318 view.rc:39 msgid "&Up" @@ -3439,6 +3439,8 @@ msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." msgstr "" +"このアプレットを再起動するまでは、デバイスを無効化または有効化したあとでも、" +"ここにある接続済みジョイスティックの一覧は更新されません。" #: joy.rc:47 msgid "Test Joystick" @@ -3446,23 +3448,23 @@ msgstr "ジョイスティックのテスト" #: joy.rc:51 msgid "Buttons" -msgstr "" +msgstr "ボタン" #: joy.rc:60 msgid "Test Force Feedback" msgstr "フォースフィードバックのテスト" #: joy.rc:64 -#, fuzzy -#| msgid "Available formats" msgid "Available Effects" -msgstr "利用できる形式" +msgstr "利用可能な効果" #: joy.rc:66 msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" +"選択した効果を有効化するにはコントローラのボタンを押してください。効果の方向" +"はコントローラの軸で変更できます。" #: joy.rc:28 msgid "Game Controllers" @@ -9661,6 +9663,33 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" +"プログラムを開始したり、拡張子に基づき通常使われるプログラムで文書を開きま" +"す。\n" +"使い方:\n" +"start [オプション] プログラムファイル名 [...]\n" +"start [オプション] 文書ファイル名\n" +"\n" +"オプション:\n" +"\"タイトル\" 子ウィンドウのタイトルを指定します。\n" +"/d directory プログラムを指定したディレクトリで開始します。 \n" +"/b プログラムで新しいコンソールを作成しません。\n" +"/i 初期の環境変数でプログラムを開始します。\n" +"/min 最小化状態でプログラムを開始します。\n" +"/max 最大化状態でプログラムを開始します。\n" +"/low 優先度クラス'低'でプログラムを開始します。\n" +"/normal 優先度クラス'通常'でプログラムを開始します。\n" +"/high 優先度クラス'高'でプログラムを開始します。\n" +"/realtime 優先度クラス'リアルタイム'でプログラムを開始します。\n" +"/abovenormal 優先度クラス'通常以上'でプログラムを開始します。\n" +"/belownormal 優先度クラス'通常以下'でプログラムを開始します。\n" +"/node n 指定した NUMA ノードでプログラムを開始します。\n" +"/affinity mask 指定した関連マスクでプログラムを開始します。\n" +"/wait 開始プログラムの完了を待ち、そのプログラムの終了コードで終了しま" +"す。\n" +"/unix Unix ファイル名を使い、windows エクスプローラのようにファイルを" +"開始します。\n" +"/ProgIDOpen 文書を指定した progID を用いて開きます。\n" +"/? このヘルプを表示し、終了します。\n" #: cmd.rc:211 msgid "TIME sets or shows the current system time.\n" @@ -12138,27 +12167,27 @@ msgstr "プロセスを実行するプロセッサを制御します" #: taskmgr.rc:237 msgid "Sets process to the REALTIME priority class" -msgstr "プロセスの優先クラスをリアルタイムに設定します" +msgstr "プロセスの優先度クラスをリアルタイムに設定します" #: taskmgr.rc:238 msgid "Sets process to the HIGH priority class" -msgstr "プロセスの優先クラスを高に設定します" +msgstr "プロセスの優先度クラスを高に設定します" #: taskmgr.rc:240 msgid "Sets process to the ABOVE NORMAL priority class" -msgstr "プロセスの優先クラスを通常以上に設定します" +msgstr "プロセスの優先度クラスを通常以上に設定します" #: taskmgr.rc:242 msgid "Sets process to the NORMAL priority class" -msgstr "プロセスの優先クラスを通常に設定します" +msgstr "プロセスの優先度クラスを通常に設定します" #: taskmgr.rc:244 msgid "Sets process to the BELOW NORMAL priority class" -msgstr "プロセスの優先クラスを通常以下に設定します" +msgstr "プロセスの優先度クラスを通常以下に設定します" #: taskmgr.rc:245 msgid "Sets process to the LOW priority class" -msgstr "プロセスの優先クラスを低に設定します" +msgstr "プロセスの優先度クラスを低に設定します" #: taskmgr.rc:247 msgid "Controls Debug Channels" @@ -13633,22 +13662,16 @@ msgid "Help topics: " msgstr "ヘルプトピック: " #: wmic.rc:25 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "Error: Command line not supported\n" -msgstr "エラー: コマンドライン引数が無効です\n" +msgstr "エラー: コマンドラインはサポートされていません\n" #: wmic.rc:26 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Error: Alias not found\n" -msgstr "プロパティセットが見つかりません。\n" +msgstr "別名が見つかりません。\n" #: wmic.rc:27 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "Error: Invalid query\n" -msgstr "エラー: キー名が無効です\n" +msgstr "エラー: クエリが無効です\n" #: wordpad.rc:28 msgid "&New...\tCtrl+N"

1 0

Jacek Caban : wininet: Set last error for invalid URL argument.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: c4c3ff47e7ad1ae66cde22b0e479cabbaa019e35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4c3ff47e7ad1ae66cde22b0e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 4 17:08:06 2012 +0200 wininet: Set last error for invalid URL argument. --- dlls/wininet/cookie.c | 5 +++- dlls/wininet/tests/internet.c | 45 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 6f9caad..8552548 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -360,7 +360,10 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, host[0] = 0; ret = COOKIE_crackUrlSimple(lpszUrl, host, sizeof(host)/sizeof(host[0]), path, sizeof(path)/sizeof(path[0])); - if (!ret || !host[0]) return FALSE; + if (!ret || !host[0]) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } return get_cookie(host, path, lpCookieData, lpdwSize); } diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index f2ea04f..a0b6466 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -40,6 +40,8 @@ static BOOL (WINAPI *pInternetTimeToSystemTimeW)(LPCWSTR ,SYSTEMTIME *,DWORD); static BOOL (WINAPI *pIsDomainLegalCookieDomainW)(LPCWSTR, LPCWSTR); static DWORD (WINAPI *pPrivacyGetZonePreferenceW)(DWORD, DWORD, LPDWORD, LPWSTR, LPDWORD); static DWORD (WINAPI *pPrivacySetZonePreferenceW)(DWORD, DWORD, DWORD, LPCWSTR); +static BOOL (WINAPI *pInternetGetCookieExA)(LPCSTR,LPCSTR,LPSTR,LPDWORD,DWORD,LPVOID); +static BOOL (WINAPI *pInternetGetCookieExW)(LPCWSTR,LPCWSTR,LPWSTR,LPDWORD,DWORD,LPVOID); /* ############################### */ @@ -471,6 +473,36 @@ static void test_complicated_cookie(void) ok(strstr(buffer,"O=P")==NULL,"O=P present\n"); } +static void test_cookie_url(void) +{ + WCHAR bufw[512]; + char buf[512]; + DWORD len; + BOOL res; + + static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; + + len = sizeof(buf); + res = InternetGetCookieA("about:blank", NULL, buf, &len); + ok(!res && GetLastError() == ERROR_INVALID_PARAMETER, + "InternetGetCookeA failed: %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); + + len = sizeof(bufw)/sizeof(*bufw); + res = InternetGetCookieW(about_blankW, NULL, bufw, &len); + ok(!res && GetLastError() == ERROR_INVALID_PARAMETER, + "InternetGetCookeW failed: %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); + + len = sizeof(buf); + res = pInternetGetCookieExA("about:blank", NULL, buf, &len, 0, NULL); + ok(!res && GetLastError() == ERROR_INVALID_PARAMETER, + "InternetGetCookeExA failed: %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); + + len = sizeof(bufw)/sizeof(*bufw); + res = pInternetGetCookieExW(about_blankW, NULL, bufw, &len, 0, NULL); + ok(!res && GetLastError() == ERROR_INVALID_PARAMETER, + "InternetGetCookeExW failed: %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); +} + static void test_null(void) { HINTERNET hi, hc; @@ -1381,11 +1413,6 @@ START_TEST(internet) HMODULE hdll; hdll = GetModuleHandleA("wininet.dll"); - if(!GetProcAddress(hdll, "InternetGetCookieExW")) { - win_skip("Too old IE (older than 6.0)\n"); - return; - } - pCreateUrlCacheContainerA = (void*)GetProcAddress(hdll, "CreateUrlCacheContainerA"); pCreateUrlCacheContainerW = (void*)GetProcAddress(hdll, "CreateUrlCacheContainerW"); pInternetTimeFromSystemTimeA = (void*)GetProcAddress(hdll, "InternetTimeFromSystemTimeA"); @@ -1395,11 +1422,19 @@ START_TEST(internet) pIsDomainLegalCookieDomainW = (void*)GetProcAddress(hdll, (LPCSTR)117); pPrivacyGetZonePreferenceW = (void*)GetProcAddress(hdll, "PrivacyGetZonePreferenceW"); pPrivacySetZonePreferenceW = (void*)GetProcAddress(hdll, "PrivacySetZonePreferenceW"); + pInternetGetCookieExA = (void*)GetProcAddress(hdll, "InternetGetCookieExA"); + pInternetGetCookieExW = (void*)GetProcAddress(hdll, "InternetGetCookieExW"); + + if(!pInternetGetCookieExW) { + win_skip("Too old IE (older than 6.0)\n"); + return; + } test_InternetCanonicalizeUrlA(); test_InternetQueryOptionA(); test_get_cookie(); test_complicated_cookie(); + test_cookie_url(); test_version(); test_null(); test_Option_PerConnectionOption();

1 0

← Newer
1
...
72
73
74
75
76
77
78
...
83
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 September 2012