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

Francois Gouget : testbot/build: Time the Build.pl operations.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: dcb4c422b20f9b495fe701c06abb431a3bad2652 URL: http://source.winehq.org/git/tools.git/?a=commit;h=dcb4c422b20f9b495fe701c0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:31:39 2013 +0100 testbot/build: Time the Build.pl operations. --- testbot/bin/build/Build.pl | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index dca4328..ef3fece 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -179,7 +179,7 @@ sub BuildTestExecutable InfoMsg "Reconfigure $Bits-bit crossbuild\n"; my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); system("( cd $DataDir/build-mingw$Bits && set -x && " . - " ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . + " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -192,7 +192,7 @@ sub BuildTestExecutable { InfoMsg "Recreating include/Makefile\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus include/Makefile " . + " time make -j$ncpus include/Makefile " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -201,7 +201,7 @@ sub BuildTestExecutable } system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus include " . + " time make -j$ncpus include " . ") >> $LogDir/Build.log 2>&1"); if ($? != 0) { @@ -214,7 +214,7 @@ sub BuildTestExecutable { InfoMsg "Rebuilding $BaseName import lib\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus $PatchType/$BaseName/Makefile " . + " time make -j$ncpus $PatchType/$BaseName/Makefile " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -223,7 +223,7 @@ sub BuildTestExecutable else { system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus -C $PatchType/$BaseName lib$BaseName.a " . + " time make -j$ncpus -C $PatchType/$BaseName lib$BaseName.a " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -236,7 +236,7 @@ sub BuildTestExecutable { InfoMsg "Recreating tests/Makefile\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus $PatchType/$BaseName/tests/Makefile " . + " time make -j$ncpus $PatchType/$BaseName/tests/Makefile " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -249,7 +249,7 @@ sub BuildTestExecutable { InfoMsg "Making build dependencies\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus __builddeps__ " . + " time make -j$ncpus __builddeps__ " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -269,7 +269,7 @@ sub BuildTestExecutable InfoMsg "Making test executable\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus -C $TestsDir " . + " time make -j$ncpus -C $TestsDir " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) {

1 0

Francois Gouget : testbot/web: Make JobDetails. pl handle empty err logs correctly.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: 0c329e178170c6c489ca98198f2958b8d0c30c5c URL: http://source.winehq.org/git/tools.git/?a=commit;h=0c329e178170c6c489ca9819… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:39:45 2013 +0100 testbot/web: Make JobDetails.pl handle empty err logs correctly. The task scripts used to create the err log and then delete it if it was empty. However the Task module now redirects the script's stderr to the err log to help diagnose script bugs (e.g. perl errors). That means the script must only append to the err log and should certainly not delete it. So JobDetails.pl should now be able to deal with empty err logs. --- testbot/web/JobDetails.pl | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 11bb122..a751f11 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -410,22 +410,25 @@ sub GenerateBody if (open ERRFILE, "<$ErrName") { - if (! $First) - { - print "</code></pre>\n"; - $First = 1; - } + $CurrentDll = "*err*"; while (defined($Line = <ERRFILE>)) { $HasLogEntries = 1; chomp($Line); - if ($First) + if ($PrintedDll ne $CurrentDll) { - print "<br>\n"; - print "<pre><code>"; - $First = !1; + if ($First) + { + $First = !1; + } + else + { + print "</code></pre>\n"; + } + $PrintedDll = $CurrentDll; } - print $self->escapeHTML($Line), "\n"; + print "<br>\n"; + print "<pre><code>", $self->escapeHTML($Line), "\n"; } close ERRFILE; }

1 0

Francois Gouget : testbot/build: Also update the makefile if one of the top-level Make.*. in files is modified.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: fcab37e192762e826bf7dd6140bd20f6a246d7ea URL: http://source.winehq.org/git/tools.git/?a=commit;h=fcab37e192762e826bf7dd61… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:31:36 2013 +0100 testbot/build: Also update the makefile if one of the top-level Make.*.in files is modified. --- testbot/bin/build/Build.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 76e73f4..dca4328 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -86,7 +86,7 @@ sub ApplyPatch ($NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || ! $NeedImplib || ! $NeedAutoconf || ! $NeedConfigure)) { - if ($Line =~ m=^diff.*tests/Makefile\.in=) + if ($Line =~ m=^diff.*(?:tests/Makefile\.in|Make\.vars\.in|Make\.rules\.in|Maketest\.rules\.in)$=) { $NeedMakefile = 1; }

1 0

Francois Gouget : testbot/TestAgent: Quote the unknown command to avoid ambiguity.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: 55a4611ff48ca27d8aea736a91e210b5bb27f4ad URL: http://source.winehq.org/git/tools.git/?a=commit;h=55a4611ff48ca27d8aea736a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:36:13 2013 +0100 testbot/TestAgent: Quote the unknown command to avoid ambiguity. --- testbot/scripts/TestAgent | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 521e741..897ca81 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -188,7 +188,7 @@ while (@ARGV) } else { - error("unknown command $arg\n"); + error("unknown command '$arg'\n"); $Usage = 2; } }

1 0

Francois Gouget : testbot/build: Let make rebuild the makefiles instead of calling config.status from Build .pl.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: e3a4ae40910388d8f68afa5abf3e47e515055d31 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e3a4ae40910388d8f68afa5a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:31:32 2013 +0100 testbot/build: Let make rebuild the makefiles instead of calling config.status from Build.pl. --- testbot/bin/build/Build.pl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 2964049..76e73f4 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -192,7 +192,7 @@ sub BuildTestExecutable { InfoMsg "Recreating include/Makefile\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " ./config.status --file include/Makefile:Make.vars.in:include/Makefile.in " . + " make -j$ncpus include/Makefile " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -214,7 +214,7 @@ sub BuildTestExecutable { InfoMsg "Rebuilding $BaseName import lib\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " ./config.status --file $PatchType/$BaseName/Makefile:Make.vars.in:$PatchType/$BaseName/Makefile.in " . + " make -j$ncpus $PatchType/$BaseName/Makefile " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -236,7 +236,7 @@ sub BuildTestExecutable { InfoMsg "Recreating tests/Makefile\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " ./config.status --file $PatchType/$BaseName/tests/Makefile:Make.vars.in:$PatchType/$BaseName/tests/Makefile.in " . + " make -j$ncpus $PatchType/$BaseName/tests/Makefile " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) {

1 0

Francois Gouget : testbot/build: Use the standard MinGW compiler names in the Build.pl script.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: 77322aa20f775bb2aac62ff2764f5893281ef628 URL: http://source.winehq.org/git/tools.git/?a=commit;h=77322aa20f775bb2aac62ff2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:31:29 2013 +0100 testbot/build: Use the standard MinGW compiler names in the Build.pl script. The same fix was applied to the Reconfig.pl script previously. --- testbot/bin/build/Build.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 21899af..2964049 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -177,7 +177,7 @@ sub BuildTestExecutable if ($NeedConfigure) { InfoMsg "Reconfigure $Bits-bit crossbuild\n"; - my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-pc-mingw32"); + my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); system("( cd $DataDir/build-mingw$Bits && set -x && " . " ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . ") >>$LogDir/Build.log 2>&1");

1 0

Francois Gouget : testbot/VMs: Add a maintenance status for VMs.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: 89ec21a5445fde7d66000371d3b725d0bee8ee42 URL: http://source.winehq.org/git/tools.git/?a=commit;h=89ec21a5445fde7d66000371… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 11:13:35 2013 +0100 testbot/VMs: Add a maintenance status for VMs. This makes it possible to distinguish between broken (offline) VMs, and VMs the administrator is reconfiguring. --- testbot/ddl/update22.sql | 4 ++++ testbot/ddl/winetestbot.sql | 2 +- testbot/lib/WineTestBot/VMs.pm | 10 ++++++++-- testbot/web/Submit.pl | 8 ++++++-- testbot/web/index.pl | 31 +++++++++++++++++++++++-------- 5 files changed, 42 insertions(+), 13 deletions(-) diff --git a/testbot/ddl/update22.sql b/testbot/ddl/update22.sql new file mode 100644 index 0000000..cd4f5a2 --- /dev/null +++ b/testbot/ddl/update22.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE VMs + MODIFY Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline', 'maintenance') NOT NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 4763d86..4912a59 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -48,7 +48,7 @@ CREATE TABLE VMs SortOrder INT(3) NOT NULL, Type ENUM('win32', 'win64', 'build') NOT NULL, Role ENUM('extra', 'base', 'winetest', 'retired', 'deleted') NOT NULL, - Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline') NOT NULL, + Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline', 'maintenance') NOT NULL, ChildPid INT(5) NULL, VirtURI VARCHAR(64) NOT NULL, VirtDomain VARCHAR(32) NOT NULL, diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 826b0f6..04aeb3c 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -185,6 +185,12 @@ responding anymore), making it temporarily unusable. New jobs can still be added for this VM but they won't be run until an administrator fixes it. The main web status page has a warning indicator on when some VMs are offline. +=item maintenance + +A WineTestBot administrator is working on the VM so that it cannot be used for +the tests. The main web status page has a warning indicator on when some VMs +are undergoing maintenance. + =back =cut @@ -572,7 +578,7 @@ BEGIN CreateBasicPropertyDescriptor("SortOrder", "Display order", !1, 1, "N", 3), CreateEnumPropertyDescriptor("Type", "Type of VM", !1, 1, ['win32', 'win64', 'build']), CreateEnumPropertyDescriptor("Role", "VM Role", !1, 1, ['extra', 'base', 'winetest', 'retired', 'deleted']), - CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline']), + CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline', 'maintenance']), # Note: ChildPid is only valid when Status == 'reverting' or 'sleeping'. CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), CreateBasicPropertyDescriptor("VirtURI", "LibVirt URI of the VM", !1, 1, "A", 64), @@ -668,7 +674,7 @@ sub FilterEnabledRole($) sub FilterEnabledStatus($) { my ($self) = @_; - # Filter out the disabled VMs, that is the offline ones + # Filter out the disabled VMs, that is the offline and maintenance ones $self->AddFilter("Status", ["dirty", "reverting", "sleeping", "idle", "running"]); } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 88a27dc..1288bf0 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -83,10 +83,10 @@ sub GetHeaderText { my $HeaderText = "Select the VMs on which you want to run your test."; my $VMs = CreateVMs(); - $VMs->AddFilter("Status", ["offline"]); + $VMs->AddFilter("Status", ["offline", "maintenance"]); if (!$VMs->IsEmpty()) { - $HeaderText .= "<br>NOTE: Offline VMs will not be able to run your tests right away."; + $HeaderText .= "<br>NOTE: Offline VMs and those undergoing maintenance will not be able to run your tests right away."; } return $HeaderText; } @@ -260,6 +260,10 @@ sub GenerateFields { print " [offline]"; } + elsif ($VM->Status eq 'maintenance') + { + print " [maintenance]"; + } print "</label><div class='ItemValue'><input type='checkbox' name='$FieldName'"; if ($self->GetParam("Page") == 1 || $self->GetParam($FieldName)) { diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 94d8254..1dffaf7 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -234,22 +234,37 @@ sub GenerateBody } print "</div>\n"; - print "<div class='GeneralStatusItem'>"; - my $VMs = CreateVMs(); - $VMs->FilterEnabledRole(); - $VMs->AddFilter("Status", ["offline"]); - if ($VMs->IsEmpty()) + my $OfflineVMs = CreateVMs(); + $OfflineVMs->FilterEnabledRole(); + $OfflineVMs->AddFilter("Status", ["offline"]); + my $MaintenanceVMs = CreateVMs(); + $MaintenanceVMs->FilterEnabledRole(); + $MaintenanceVMs->AddFilter("Status", ["maintenance"]); + if ($OfflineVMs->IsEmpty() and $MaintenanceVMs->IsEmpty()) { + print "<div class='GeneralStatusItem'>"; $self->OutputDot("green"); print "<div class='GeneralStatusItemText'><a href='#vms'>All VMs are online</a></div>"; + print "</div>\n"; } else { - $self->OutputDot("red"); - print "<div class='GeneralStatusItemText'><a href='#vms'>One or more VMs are offline</a></div>"; + if (!$OfflineVMs->IsEmpty()) + { + print "<div class='GeneralStatusItem'>"; + $self->OutputDot("red"); + print "<div class='GeneralStatusItemText'><a href='#vms'>One or more VMs are offline</a></div>"; + print "</div>\n"; + } + if (!$MaintenanceVMs->IsEmpty()) + { + print "<div class='GeneralStatusItem'>"; + $self->OutputDot("red"); + print "<div class='GeneralStatusItemText'><a href='#vms'>One or more VMs are undergoing maintenance</a></div>"; + print "</div>\n"; + } } print "</div>\n"; - print "</div>\n"; print "<h2><a name='jobs'></a>Jobs</h2>\n"; my $Jobs = CreateJobs();

1 0

Francois Gouget : testbot/VMs: Schedule jobs on offline VMs.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: e7ea34bd527a38065ddf63f6e3036f1bd09b0cf8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e7ea34bd527a38065ddf63f6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 11:13:30 2013 +0100 testbot/VMs: Schedule jobs on offline VMs. Being 'offline' is supposed to be temporary so jobs can still be scheduled on these VMs (especially the WineTest ones). These jobs will just be run later, once an administrator has fixed the VM. --- testbot/bin/CheckForWinetestUpdate.pl | 1 - testbot/lib/WineTestBot/Jobs.pm | 1 - testbot/lib/WineTestBot/Patches.pm | 1 - testbot/lib/WineTestBot/VMs.pm | 8 ++++---- testbot/web/Submit.pl | 11 ++++++----- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index c8909e6..8cbcc9c 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -92,7 +92,6 @@ sub AddJob $VMs->AddFilter("Type", ["win32", "win64"]); $VMs->AddFilter("Role", ["winetest"]); } - $VMs->FilterEnabledStatus(); foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { my $Task = $Tasks->Add(); diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 4b7d425..c6421e9 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -542,7 +542,6 @@ sub ScheduleJobs() my %Hosts; my $VMs = CreateVMs(); $VMs->FilterEnabledRole(); - $VMs->FilterEnabledStatus(); foreach my $VM (@{$VMs->GetItems()}) { my $Host = $VM->GetHost(); diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index e8143ca..186398d 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -236,7 +236,6 @@ sub Submit $VMs = CreateVMs(); $VMs->AddFilter("Type", $Bits eq "32" ? ["win32", "win64"] : ["win64"]); $VMs->AddFilter("Role", ["base"]); - $VMs->FilterEnabledStatus(); if (@{$VMs->GetKeys()}) { # Create the corresponding Step diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index eea9e78..826b0f6 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -180,10 +180,10 @@ next step will be to revert it to the idle snapshot so it can be used again. =item offline -This VM should not be used. The WineTestBot automatically puts VMs into this -state if errors happen when manipulating them, such as if they fail to revert, -etc. The main web status page has a warning indicator on when some VMs are -offline. +An error occurred with this VM (typically it failed to revert or is not +responding anymore), making it temporarily unusable. New jobs can still be +added for this VM but they won't be run until an administrator fixes it. +The main web status page has a warning indicator on when some VMs are offline. =back diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 56e542d..88a27dc 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -84,10 +84,9 @@ sub GetHeaderText my $HeaderText = "Select the VMs on which you want to run your test."; my $VMs = CreateVMs(); $VMs->AddFilter("Status", ["offline"]); - if (! $VMs->IsEmpty()) + if (!$VMs->IsEmpty()) { - $HeaderText .= "<br>NOTE: Some VMs are currently offline and are not " . - "shown here."; + $HeaderText .= "<br>NOTE: Offline VMs will not be able to run your tests right away."; } return $HeaderText; } @@ -237,8 +236,6 @@ sub GenerateFields { $VMs->AddFilter("Type", ["win32", "win64"]); } - # Scheduling jobs on offline VMs is not allowed - $VMs->FilterNotOffline(); if ($self->{ShowAll}) { # All but the retired and deleted ones @@ -259,6 +256,10 @@ sub GenerateFields { print " (", $self->CGI->escapeHTML($VM->Description), ")"; } + if ($VM->Status eq 'offline') + { + print " [offline]"; + } print "</label><div class='ItemValue'><input type='checkbox' name='$FieldName'"; if ($self->GetParam("Page") == 1 || $self->GetParam($FieldName)) {

1 0

Francois Gouget : testbot/web: Don't report 'offline VMs' if it' s only retired and deleted VMs.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: 1aecad4c688e74ab404cfb895d692f71829d7372 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1aecad4c688e74ab404cfb89… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 11:13:21 2013 +0100 testbot/web: Don't report 'offline VMs' if it's only retired and deleted VMs. The Status is irrelevant for retired and deleted VMs. --- testbot/web/index.pl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 59bf16a..94d8254 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -236,6 +236,7 @@ sub GenerateBody print "<div class='GeneralStatusItem'>"; my $VMs = CreateVMs(); + $VMs->FilterEnabledRole(); $VMs->AddFilter("Status", ["offline"]); if ($VMs->IsEmpty()) {

1 0

Francois Gouget : winhttp: netconn_get_next_line() is not used anymore so remove it.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: fbe7ab5c5af9b7ca3decc82ae986be2c78fa6165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe7ab5c5af9b7ca3decc82ae… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 26 16:27:51 2013 +0100 winhttp: netconn_get_next_line() is not used anymore so remove it. --- dlls/winhttp/net.c | 75 ---------------------------------------- dlls/winhttp/winhttp_private.h | 1 - 2 files changed, 0 insertions(+), 76 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 631939a..bc83542 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -734,81 +734,6 @@ BOOL netconn_query_data_available( netconn_t *conn, DWORD *available ) return TRUE; } -BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen ) -{ - struct pollfd pfd; - BOOL ret = FALSE; - DWORD recvd = 0; - - if (!netconn_connected( conn )) return FALSE; - - if (conn->secure) - { - while (recvd < *buflen) - { - int dummy; - if (!netconn_recv( conn, &buffer[recvd], 1, 0, &dummy )) - { - set_last_error( ERROR_CONNECTION_ABORTED ); - break; - } - if (buffer[recvd] == '\n') - { - ret = TRUE; - break; - } - if (buffer[recvd] != '\r') recvd++; - } - if (ret) - { - buffer[recvd++] = 0; - *buflen = recvd; - TRACE("received line %s\n", debugstr_a(buffer)); - } - return ret; - } - - pfd.fd = conn->socket; - pfd.events = POLLIN; - while (recvd < *buflen) - { - int timeout, res; - struct timeval tv; - socklen_t len = sizeof(tv); - - if ((res = getsockopt( conn->socket, SOL_SOCKET, SO_RCVTIMEO, (void*)&tv, &len ) != -1)) - timeout = tv.tv_sec * 1000 + tv.tv_usec / 1000; - else - timeout = -1; - if (poll( &pfd, 1, timeout ) > 0) - { - if ((res = recv( conn->socket, &buffer[recvd], 1, 0 )) <= 0) - { - if (res == -1) set_last_error( sock_get_error( errno ) ); - break; - } - if (buffer[recvd] == '\n') - { - ret = TRUE; - break; - } - if (buffer[recvd] != '\r') recvd++; - } - else - { - set_last_error( ERROR_WINHTTP_TIMEOUT ); - break; - } - } - if (ret) - { - buffer[recvd++] = 0; - *buflen = recvd; - TRACE("received line %s\n", debugstr_a(buffer)); - } - return ret; -} - DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) { struct timeval tv; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index b19aadf..82b4582 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -235,7 +235,6 @@ BOOL netconn_close( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_connect( netconn_t *, const struct sockaddr *, unsigned int, int ) DECLSPEC_HIDDEN; BOOL netconn_connected( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_create( netconn_t *, int, int, int ) DECLSPEC_HIDDEN; -BOOL netconn_get_next_line( netconn_t *, char *, DWORD * ) DECLSPEC_HIDDEN; BOOL netconn_init( netconn_t * ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN; BOOL netconn_query_data_available( netconn_t *, DWORD * ) DECLSPEC_HIDDEN;

1 0