October 2012 - Wine-Commits

Michael Stefaniuc : ole32/tests: Fix a memleak on an error path (Smatch).
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: 470ad72b05a3159ce3d21c4a2ac7e54dd59052f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=470ad72b05a3159ce3d21c4a2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 30 23:15:44 2012 +0100 ole32/tests: Fix a memleak on an error path (Smatch). --- dlls/ole32/tests/propvariant.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 769d49a..4d9a81b 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -445,6 +445,7 @@ static void test_varianttoproperty(void) if (len == 0xdeadbeef) { + HeapFree(GetProcessHeap(), 0, own_propvalue); return; }

1 0

André Hentschel : wineps: Avoid memory leaks (coverity ).
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: 42f791ccd561f9188109dd000940536849919f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42f791ccd561f9188109dd000… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 30 20:07:15 2012 +0100 wineps: Avoid memory leaks (coverity). --- dlls/wineps.drv/download.c | 7 ++++--- dlls/wineps.drv/ps.c | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 037ea34..f984225 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -313,9 +313,10 @@ BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev) UINT emsize; if (!get_bbox(dev->hdc, &bbox, &emsize)) { - HeapFree(GetProcessHeap(), 0, potm); - return FALSE; - } + HeapFree(GetProcessHeap(), 0, ps_name); + HeapFree(GetProcessHeap(), 0, potm); + return FALSE; + } if(!is_room_for_font(physDev)) PSDRV_EmptyDownloadList(dev, TRUE); diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index b6bbe7a..35a55f0 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -385,6 +385,7 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) strlen(escaped_title) + 30 ); if(!buf) { WARN("HeapAlloc failed\n"); + HeapFree(GetProcessHeap(), 0, escaped_title); return 0; }

1 0

Daniel Lehman : msvcp90: Fix usage of fpos<>::off vs fpos<>::pos.
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: 771cc7fdbd43550980c9250b9421cfe4621f3bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=771cc7fdbd43550980c9250b9… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Sep 28 17:17:53 2012 -0700 msvcp90: Fix usage of fpos<>::off vs fpos<>::pos. --- dlls/msvcp90/ios.c | 74 ++++++++++++++++++++++++++-------------------------- 1 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 9435cb2..b1acb3f 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -1250,8 +1250,8 @@ fpos_int* __thiscall basic_streambuf_char_seekoff(basic_streambuf_char *this, fpos_int *ret, streamoff off, int way, int mode) { TRACE("(%p %ld %d %d)\n", this, off, way, mode); - ret->off = 0; - ret->pos = -1; + ret->off = -1; + ret->pos = 0; ret->state = 0; return ret; } @@ -1285,8 +1285,8 @@ fpos_int* __thiscall basic_streambuf_char_seekpos(basic_streambuf_char *this, fpos_int *ret, fpos_int pos, int mode) { TRACE("(%p %s %d)\n", this, debugstr_fpos_int(&pos), mode); - ret->off = 0; - ret->pos = -1; + ret->off = -1; + ret->pos = 0; ret->state = 0; return ret; } @@ -2020,8 +2020,8 @@ fpos_int* __thiscall basic_streambuf_wchar_seekoff(basic_streambuf_wchar *this, fpos_int *ret, streamoff off, int way, int mode) { TRACE("(%p %ld %d %d)\n", this, off, way, mode); - ret->off = 0; - ret->pos = -1; + ret->off = -1; + ret->pos = 0; ret->state = 0; return ret; } @@ -2061,8 +2061,8 @@ fpos_int* __thiscall basic_streambuf_wchar_seekpos(basic_streambuf_wchar *this, fpos_int *ret, fpos_int pos, int mode) { TRACE("(%p %s %d)\n", this, debugstr_fpos_int(&pos), mode); - ret->off = 0; - ret->pos = -1; + ret->off = -1; + ret->pos = 0; ret->state = 0; return ret; } @@ -2804,8 +2804,8 @@ fpos_int* __thiscall basic_filebuf_char_seekoff(basic_filebuf_char *this, if(!basic_filebuf_char_is_open(this) || !basic_filebuf_char__Endwrite(this) || fseek(this->file, off, way)) { - ret->off = 0; - ret->pos = -1; + ret->off = -1; + ret->pos = 0; ret->state = 0; return ret; } @@ -2830,8 +2830,8 @@ fpos_int* __thiscall basic_filebuf_char_seekpos(basic_filebuf_char *this, if(!basic_filebuf_char_is_open(this) || !basic_filebuf_char__Endwrite(this) || fseek(this->file, (LONG)pos.pos, SEEK_SET) || (pos.off && fseek(this->file, pos.off, SEEK_CUR))) { - ret->off = 0; - ret->pos = -1; + ret->off = -1; + ret->pos = 0; ret->state = 0; return ret; } @@ -3421,8 +3421,8 @@ fpos_int* __thiscall basic_filebuf_wchar_seekoff(basic_filebuf_wchar *this, if(!basic_filebuf_wchar_is_open(this) || !basic_filebuf_wchar__Endwrite(this) || fseek(this->file, off, way)) { - ret->off = 0; - ret->pos = -1; + ret->off = -1; + ret->pos = 0; ret->state = 0; return ret; } @@ -3449,8 +3449,8 @@ fpos_int* __thiscall basic_filebuf_wchar_seekpos(basic_filebuf_wchar *this, if(!basic_filebuf_wchar_is_open(this) || !basic_filebuf_wchar__Endwrite(this) || fseek(this->file, (LONG)pos.pos, SEEK_SET) || (pos.off && fseek(this->file, pos.off, SEEK_CUR))) { - ret->off = 0; - ret->pos = -1; + ret->off = -1; + ret->pos = 0; ret->state = 0; return ret; } @@ -3854,7 +3854,7 @@ fpos_int* __thiscall basic_stringbuf_char_seekpos(basic_stringbuf_char *this, { TRACE("(%p %p %s %d)\n", this, ret, debugstr_fpos_int(&pos), mode); - if(pos.off==0 && pos.pos==-1 && pos.state==0) { + if(pos.off==-1 && pos.pos==0 && pos.state==0) { *ret = pos; return ret; } @@ -4267,7 +4267,7 @@ fpos_int* __thiscall basic_stringbuf_wchar_seekpos(basic_stringbuf_wchar *this, { TRACE("(%p %p %s %d)\n", this, ret, debugstr_fpos_int(&pos), mode); - if(pos.off==0 && pos.pos==-1 && pos.state==0) { + if(pos.off==-1 && pos.pos==0 && pos.state==0) { *ret = pos; return ret; } @@ -5610,7 +5610,7 @@ basic_ostream_char* __thiscall basic_ostream_char_seekp(basic_ostream_char *this basic_streambuf_char_pubseekoff(basic_ios_char_rdbuf_get(base), &seek, off, way, OPENMODE_out); - if(seek.off==0 && seek.pos==-1 && seek.state==0) + if(seek.off==-1 && seek.pos==0 && seek.state==0) basic_ios_char_setstate(base, IOSTATE_failbit); } return this; @@ -5630,7 +5630,7 @@ basic_ostream_char* __thiscall basic_ostream_char_seekp_fpos(basic_ostream_char basic_streambuf_char_pubseekpos(basic_ios_char_rdbuf_get(base), &seek, pos, OPENMODE_out); - if(seek.off==0 && seek.pos==-1 && seek.state==0) + if(seek.off==-1 && seek.pos==0 && seek.state==0) basic_ios_char_setstate(base, IOSTATE_failbit); } return this; @@ -5649,8 +5649,8 @@ fpos_int* __thiscall basic_ostream_char_tellp(basic_ostream_char *this, fpos_int basic_streambuf_char_pubseekoff(basic_ios_char_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_out); }else { - ret->off = 0; - ret->pos = -1; + ret->off = -1; + ret->pos = 0; ret->state = 0; } return ret; @@ -6419,7 +6419,7 @@ basic_ostream_wchar* __thiscall basic_ostream_wchar_seekp(basic_ostream_wchar *t basic_streambuf_wchar_pubseekoff(basic_ios_wchar_rdbuf_get(base), &seek, off, way, OPENMODE_out); - if(seek.off==0 && seek.pos==-1 && seek.state==0) + if(seek.off==-1 && seek.pos==0 && seek.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); } return this; @@ -6441,7 +6441,7 @@ basic_ostream_wchar* __thiscall basic_ostream_wchar_seekp_fpos(basic_ostream_wch basic_streambuf_wchar_pubseekpos(basic_ios_wchar_rdbuf_get(base), &seek, pos, OPENMODE_out); - if(seek.off==0 && seek.pos==-1 && seek.state==0) + if(seek.off==-1 && seek.pos==0 && seek.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); } return this; @@ -6462,8 +6462,8 @@ fpos_int* __thiscall basic_ostream_wchar_tellp(basic_ostream_wchar *this, fpos_i basic_streambuf_wchar_pubseekoff(basic_ios_wchar_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_out); }else { - ret->off = 0; - ret->pos = -1; + ret->off = -1; + ret->pos = 0; ret->state = 0; } return ret; @@ -7746,15 +7746,15 @@ fpos_int* __thiscall basic_istream_char_tellg(basic_istream_char *this, fpos_int ret, 0, SEEKDIR_cur, OPENMODE_in); basic_istream_char_sentry_destroy(this); - if(ret->off==0 && ret->pos==-1 && ret->state==0) + if(ret->off==-1 && ret->pos==0 && ret->state==0) basic_ios_char_setstate(base, IOSTATE_failbit); return ret; } } basic_istream_char_sentry_destroy(this); - ret->off = 0; - ret->pos = -1; + ret->off = -1; + ret->pos = 0; ret->state = 0; return ret; } @@ -7774,7 +7774,7 @@ basic_istream_char* __thiscall basic_istream_char_seekg(basic_istream_char *this basic_streambuf_char_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); - if(ret.off==0 && ret.pos==-1 && ret.state==0) + if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_char_setstate(base, IOSTATE_failbit); else basic_ios_char_clear(base, IOSTATE_goodbit); @@ -7801,7 +7801,7 @@ basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char basic_streambuf_char_pubseekpos(strbuf, &ret, pos, OPENMODE_in); basic_istream_char_sentry_destroy(this); - if(ret.off==0 && ret.pos==-1 && ret.state==0) + if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_char_setstate(base, IOSTATE_failbit); else basic_ios_char_clear(base, IOSTATE_goodbit); @@ -9028,15 +9028,15 @@ fpos_int* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, fpos_i ret, 0, SEEKDIR_cur, OPENMODE_in); basic_istream_wchar_sentry_destroy(this); - if(ret->off==0 && ret->pos==-1 && ret->state==0) + if(ret->off==-1 && ret->pos==0 && ret->state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); return ret; } } basic_istream_wchar_sentry_destroy(this); - ret->off = 0; - ret->pos = -1; + ret->off = -1; + ret->pos = 0; ret->state = 0; return ret; } @@ -9059,7 +9059,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *t basic_streambuf_wchar_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); basic_istream_wchar_sentry_destroy(this); - if(ret.off==0 && ret.pos==-1 && ret.state==0) + if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); else basic_ios_wchar_clear(base, IOSTATE_goodbit); @@ -9088,7 +9088,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wch basic_streambuf_wchar_pubseekpos(strbuf, &ret, pos, OPENMODE_in); basic_istream_wchar_sentry_destroy(this); - if(ret.off==0 && ret.pos==-1 && ret.state==0) + if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); else basic_ios_wchar_clear(base, IOSTATE_goodbit); @@ -12829,7 +12829,7 @@ fpos_int* __thiscall strstreambuf_seekpos(strstreambuf *this, fpos_int *ret, fpo { TRACE("(%p %p %s %d)\n", this, ret, debugstr_fpos_int(&pos), mode); - if(pos.off==0 && pos.pos==-1 && pos.state==0) { + if(pos.off==-1 && pos.pos==0 && pos.state==0) { *ret = pos; return ret; }

1 0

Francois Gouget : testbot/web: Remove the shebang line and add a copyright notice.
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: tools Branch: master Commit: 69cb138b894d48156f9a7b1033270feee3fb5a54 URL: http://source.winehq.org/git/tools.git/?a=commit;h=69cb138b894d48156f9a7b10… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 04:46:45 2012 +0100 testbot/web: Remove the shebang line and add a copyright notice. The shebang line is useless for web pages and only causes Apache to generate a warning. --- testbot/web/GetFile.pl | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index 1590902..697bbbd 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -1,4 +1,20 @@ -#!/usr/bin/perl -Tw +# Returns the specified Step/Task file. +# +# Copyright 2009 Ge van Geldorp +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA use strict;

1 0

Francois Gouget : testbot/bin: Fix the fatal error handling in WineRun{Build, Reconfig}.
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: tools Branch: master Commit: 0b786aab5fd2e3962da71c6182dd1b446699f20a URL: http://source.winehq.org/git/tools.git/?a=commit;h=0b786aab5fd2e3962da71c61… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 04:46:36 2012 +0100 testbot/bin: Fix the fatal error handling in WineRun{Build,Reconfig}. Don't call TaskComplete() if we don't have a valid task to start with. A failed task should have an error report file so create it first. --- testbot/bin/WineRunBuild.pl | 21 ++++++++++----------- testbot/bin/WineRunReconfig.pl | 21 ++++++++++----------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index cc0746f..e886801 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -45,6 +45,15 @@ sub FatalError my $TaskKey = defined($Task) ? $Task->GetKey() : "0"; LogMsg "$JobKey/$StepKey/$TaskKey $ErrMessage"; + if ($RptFileName) + { + my $RPTFILE; + if (open RPTFILE, ">>$RptFileName") + { + print RPTFILE $ErrMessage; + close RPTFILE; + } + } if ($Task) { @@ -55,20 +64,10 @@ sub FatalError $Task->VM->Status('dirty'); $Task->VM->Save(); - } - if ($RptFileName) - { - my $RPTFILE; - if (open RPTFILE, ">>$RptFileName") - { - print RPTFILE $ErrMessage; - close RPTFILE; - } + TaskComplete($JobKey, $StepKey, $TaskKey); } - TaskComplete($JobKey, $StepKey, $TaskKey); - exit 1; } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 9cc1e5e..c4d5c49 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -45,6 +45,15 @@ sub FatalError my $TaskKey = defined($Task) ? $Task->GetKey() : "0"; LogMsg "$JobKey/$StepKey/$TaskKey $ErrMessage"; + if ($RptFileName) + { + my $RPTFILE; + if (open RPTFILE, ">>$RptFileName") + { + print RPTFILE $ErrMessage; + close RPTFILE; + } + } if ($Task) { @@ -55,20 +64,10 @@ sub FatalError $Task->VM->Status('dirty'); $Task->VM->Save(); - } - if ($RptFileName) - { - my $RPTFILE; - if (open RPTFILE, ">>$RptFileName") - { - print RPTFILE $ErrMessage; - close RPTFILE; - } + TaskComplete($JobKey, $StepKey, $TaskKey); } - TaskComplete($JobKey, $StepKey, $TaskKey); - exit 1; }

1 0

Francois Gouget : testbot: Cleanup uses of GetKeys(), GetItem(), GetKey() and CreateCollection().
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: tools Branch: master Commit: 403fbbff4d62226b0c27eae84c348d51b2560594 URL: http://source.winehq.org/git/tools.git/?a=commit;h=403fbbff4d62226b0c27eae8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 04:47:17 2012 +0100 testbot: Cleanup uses of GetKeys(), GetItem(), GetKey() and CreateCollection(). Specifically: - Use GetItems() instead of GetKeys() where appropriate. This way the code is simpler and we avoid one call to GetItem() for each iteration. - Don't call GetKey() when we already have the object's key in a variable. - Don't store the result of CreateCollection() in a variable if we are only going to use it once. --- testbot/bin/CheckForWinetestUpdate.pl | 11 +++----- testbot/bin/Engine.pl | 17 ++++-------- testbot/bin/Janitor.pl | 38 ++++++++------------------ testbot/bin/RevertVM.pl | 3 +- testbot/bin/WineRunBuild.pl | 10 ++----- testbot/bin/WineRunReconfig.pl | 4 +-- testbot/bin/WineRunTask.pl | 4 +-- testbot/bin/WineSendLog.pl | 3 +- testbot/lib/WineTestBot/Branches.pm | 8 +---- testbot/lib/WineTestBot/CGI/Sessions.pm | 6 +--- testbot/lib/WineTestBot/Jobs.pm | 35 +++++++----------------- testbot/lib/WineTestBot/Patches.pm | 12 +++----- testbot/lib/WineTestBot/PendingPatchSets.pm | 3 +- testbot/lib/WineTestBot/StepsTasks.pm | 8 +---- testbot/lib/WineTestBot/Tasks.pm | 4 +-- testbot/lib/WineTestBot/Users.pm | 6 +--- testbot/lib/WineTestBot/VMs.pm | 9 ++---- testbot/web/JobDetails.pl | 5 +-- testbot/web/Submit.pl | 24 ++++++---------- 19 files changed, 67 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=403fbbff4d62226b0c27…

1 0

Francois Gouget : testbot/WineRunTask: Just die when killed.
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: tools Branch: master Commit: 1f15aa170d4dc112db076c082c19d39472d86ecd URL: http://source.winehq.org/git/tools.git/?a=commit;h=1f15aa170d4dc112db076c08… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 04:47:05 2012 +0100 testbot/WineRunTask: Just die when killed. This script had a SIGTERM handler that tried to retrieve the task's log file. However this caused a deadlock because testagentd is single-client and WineRunTask still had another connection to it. Anyway, this last ditch attempt to retrieve the log was questionable to begin with. --- testbot/bin/WineRunTask.pl | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index edcfd81..aedfed1 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -228,16 +228,7 @@ my $FullLogFileName = "$TaskDir/log"; my $FullErrFileName = "$TaskDir/err"; my $FullScreenshotFileName = "$TaskDir/screenshot.png"; -sub TermHandler -{ - RetrieveLogFile $Job, $Step, $Task, "C:\\winetest\\$RptFileName", - $FullLogFileName; - TakeScreenshot $VM, $FullScreenshotFileName; - FatalError "Cancelled\n", $FullErrFileName, $Job, $Step, $Task; -} - $VM->Status('running'); -$SIG{TERM} = \&TermHandler; my ($ErrProperty, $ErrMessage) = $VM->Save(); if (defined($ErrMessage)) {

1 0

Francois Gouget : testbot/bin: Remove unneeded StepsTasks imports.
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: tools Branch: master Commit: 360d290b8a50a6a09f36b7f5eebf8d25256f85f1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=360d290b8a50a6a09f36b7f5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 04:46:59 2012 +0100 testbot/bin: Remove unneeded StepsTasks imports. --- testbot/bin/WineRunBuild.pl | 1 - testbot/bin/WineRunReconfig.pl | 1 - testbot/bin/WineRunTask.pl | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index e886801..65da630 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -33,7 +33,6 @@ sub BEGIN use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Log; -use WineTestBot::StepsTasks; use WineTestBot::Engine::Notify; sub FatalError diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index c4d5c49..ba03fbd 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -33,7 +33,6 @@ sub BEGIN use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Log; -use WineTestBot::StepsTasks; use WineTestBot::Engine::Notify; sub FatalError diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 9ec499f..edcfd81 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -33,7 +33,6 @@ use POSIX qw(:fcntl_h); use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Log; -use WineTestBot::StepsTasks; use WineTestBot::Engine::Notify; sub FatalError

1 0

Alexandre Julliard : testbot: Load the configuration file from the testbot root directory.
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: tools Branch: master Commit: c0b0689be9b714ab27275eabfadfbf0240a0c411 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c0b0689be9b714ab27275eab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 30 17:32:27 2012 +0100 testbot: Load the configuration file from the testbot root directory. --- testbot/lib/WineTestBot/Config.pm | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index aa9f3e2..71cf1c6 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -80,11 +80,11 @@ $JobArchiveDays = 0; if (!$::BuildEnv) { $::BuildEnv = 0; - eval 'require "WineTestBot/ConfigLocal.pl";'; + eval 'require "$::RootDir/ConfigLocal.pl";'; if ($@) { - print STDERR "Please create a valid lib/WineTestBot/ConfigLocal.pl, " . - "use lib/WineTestBot/ConfigLocalTemplate.pl as template\n"; + print STDERR "Please create a valid $::RootDir/ConfigLocal.pl, " . + "use $::RootDir/lib/WineTestBot/ConfigLocalTemplate.pl as template\n"; exit; }

1 0

Francois Gouget : testbot/VMs: Add a function for filtering out offline VMs .
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: tools Branch: master Commit: a29506610abcef2d5c6eab0dac1cf3a993b10e4c URL: http://source.winehq.org/git/tools.git/?a=commit;h=a29506610abcef2d5c6eab0d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 31 04:46:21 2012 +0100 testbot/VMs: Add a function for filtering out offline VMs. --- testbot/bin/CheckForWinetestUpdate.pl | 3 +-- testbot/bin/Engine.pl | 11 ++++------- testbot/lib/WineTestBot/Patches.pm | 3 +-- testbot/lib/WineTestBot/VMs.pm | 7 +++++++ testbot/web/Submit.pl | 4 ++-- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 5ca5aa9..f8a9128 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -86,8 +86,7 @@ sub AddJob $VMs->AddFilter("Type", ["win32", "win64"]); $VMs->AddFilter("Role", ["winetest"]); } - # Don't schedule the 'offline' ones - $VMs->AddFilter("Status", ["reverting", "sleeping", "idle", "running", "dirty"]); + $VMs->FilterNotOffline(); foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { my $VM = $VMs->GetItem($VMKey); diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index b3cfbee..f188212 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -490,14 +490,11 @@ sub InitVMs() # On startup we don't know what state the VMs are in. So consider them all # to be dirty. my $VMs = CreateVMs(); - foreach my $VMKey (@{$VMs->GetKeys()}) + $VMs->FilterNotOffline(); + foreach my $VM (@{$VMs->GetItems()}) { - my $VM = $VMs->GetItem($VMKey); - if ($VM->Status ne "offline") - { - $VM->Status("dirty"); - $VM->Save(); - } + $VM->Status('dirty'); + $VM->Save(); } } diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index c9e0145..d7dca4e 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -238,8 +238,7 @@ sub Submit $VMs = CreateVMs(); $VMs->AddFilter("Type", $Bits eq "32" ? ["win32", "win64"] : ["win64"]); $VMs->AddFilter("Role", ["base"]); - # Don't schedule the 'offline' ones - $VMs->AddFilter("Status", ["reverting", "sleeping", "idle", "running", "dirty"]); + $VMs->FilterNotOffline(); if (@{$VMs->GetKeys()}) { # Create the corresponding Step diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index c616b09..ad6d1b0 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -618,6 +618,13 @@ sub SortKeysBySortOrder return \@SortedKeys; } +sub FilterNotOffline($) +{ + my ($self) = @_; + # All but the offline ones + $self->AddFilter("Status", ["dirty", "reverting", "sleeping", "idle", "running"]); +} + sub FilterHypervisor { my $self = shift; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index d8b222d..233583c 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -238,8 +238,8 @@ sub GenerateFields { $VMs->AddFilter("Type", ["win32", "win64"]); } - # Don't even show the 'offline' ones - $VMs->AddFilter("Status", ["reverting", "sleeping", "idle", "running", "dirty"]); + # Scheduling jobs on offline VMs is not allowed + $VMs->FilterNotOffline(); if ($self->{ShowAll}) { # All but the retired and deleted ones

1 0