October 2017 - Wine-commits

Andrey Gusev : webservices: Fix misplaced parenthesis.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: wine Branch: master Commit: 131397e784975361dbdb9e3a1aad8029e8c7954a URL: http://source.winehq.org/git/wine.git/?a=commit;h=131397e784975361dbdb9e3a1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Oct 11 16:40:11 2017 +0300 webservices: Fix misplaced parenthesis. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 0906cba..9d024a3 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3061,7 +3061,7 @@ static HRESULT skip_node( struct reader *reader ) for (;;) { - if ((hr = read_node( reader ) != S_OK) || !parent) break; + if ((hr = read_node( reader )) != S_OK || !parent) break; if (node_type( reader->current ) != WS_XML_NODE_TYPE_END_ELEMENT) continue; if (reader->current->parent == parent) return read_node( reader ); }

1 0

Jacek Caban : mshtml: Added IDocumentEvent stub implementation.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: wine Branch: master Commit: 35ebf6756aa12501f4c268b480088763a6a53b52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ebf6756aa12501f4c268b48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 11 15:16:20 2017 +0200 mshtml: Added IDocumentEvent stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/events.c | 15 +++++++++ 3 files changed, 89 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index e32385e..16aedea 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4300,6 +4300,76 @@ static const IDocumentSelectorVtbl DocumentSelectorVtbl = { DocumentSelector_querySelectorAll }; +static inline HTMLDocument *impl_from_IDocumentEvent(IDocumentEvent *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IDocumentEvent_iface); +} + +static HRESULT WINAPI DocumentEvent_QueryInterface(IDocumentEvent *iface, REFIID riid, void **ppv) +{ + HTMLDocument *This = impl_from_IDocumentEvent(iface); + return htmldoc_query_interface(This, riid, ppv); +} + +static ULONG WINAPI DocumentEvent_AddRef(IDocumentEvent *iface) +{ + HTMLDocument *This = impl_from_IDocumentEvent(iface); + return htmldoc_addref(This); +} + +static ULONG WINAPI DocumentEvent_Release(IDocumentEvent *iface) +{ + HTMLDocument *This = impl_from_IDocumentEvent(iface); + return htmldoc_release(This); +} + +static HRESULT WINAPI DocumentEvent_GetTypeInfoCount(IDocumentEvent *iface, UINT *pctinfo) +{ + HTMLDocument *This = impl_from_IDocumentEvent(iface); + return IDispatchEx_GetTypeInfoCount(&This->IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI DocumentEvent_GetTypeInfo(IDocumentEvent *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDocument *This = impl_from_IDocumentEvent(iface); + return IDispatchEx_GetTypeInfo(&This->IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI DocumentEvent_GetIDsOfNames(IDocumentEvent *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLDocument *This = impl_from_IDocumentEvent(iface); + return IDispatchEx_GetIDsOfNames(&This->IDispatchEx_iface, riid, rgszNames, cNames, lcid, + rgDispId); +} + +static HRESULT WINAPI DocumentEvent_Invoke(IDocumentEvent *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDocument *This = impl_from_IDocumentEvent(iface); + return IDispatchEx_Invoke(&This->IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI DocumentEvent_createEvent(IDocumentEvent *iface, BSTR eventType, IDOMEvent **p) +{ + HTMLDocument *This = impl_from_IDocumentEvent(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(eventType), p); + return E_NOTIMPL; +} + +static const IDocumentEventVtbl DocumentEventVtbl = { + DocumentEvent_QueryInterface, + DocumentEvent_AddRef, + DocumentEvent_Release, + DocumentEvent_GetTypeInfoCount, + DocumentEvent_GetTypeInfo, + DocumentEvent_GetIDsOfNames, + DocumentEvent_Invoke, + DocumentEvent_createEvent +}; + static void HTMLDocument_on_advise(IUnknown *iface, cp_static_data_t *cp) { HTMLDocument *This = impl_from_IHTMLDocument2((IHTMLDocument2*)iface); @@ -4652,6 +4722,8 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IHTMLDocument7_iface; else if(IsEqualGUID(&IID_IDocumentSelector, riid)) *ppv = &This->IDocumentSelector_iface; + else if(IsEqualGUID(&IID_IDocumentEvent, riid)) + *ppv = &This->IDocumentEvent_iface; else if(IsEqualGUID(&IID_IPersist, riid)) *ppv = &This->IPersistFile_iface; else if(IsEqualGUID(&IID_IPersistMoniker, riid)) @@ -4754,6 +4826,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) doc->IHTMLDocument7_iface.lpVtbl = &HTMLDocument7Vtbl; doc->IDispatchEx_iface.lpVtbl = &DocDispatchExVtbl; doc->IDocumentSelector_iface.lpVtbl = &DocumentSelectorVtbl; + doc->IDocumentEvent_iface.lpVtbl = &DocumentEventVtbl; doc->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; doc->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1727f2c..c463849 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -572,6 +572,7 @@ struct HTMLDocument { IHTMLDocument6 IHTMLDocument6_iface; IHTMLDocument7 IHTMLDocument7_iface; IDocumentSelector IDocumentSelector_iface; + IDocumentEvent IDocumentEvent_iface; IPersistMoniker IPersistMoniker_iface; IPersistFile IPersistFile_iface; IPersistHistory IPersistHistory_iface; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index ea2b6d0..f8a8d44 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2530,6 +2530,19 @@ static void test_iframe_connections(IHTMLDocument2 *doc) IHTMLDocument2_Release(iframes_doc); } +static void test_create_event(IHTMLDocument2 *doc) +{ + IDocumentEvent *doc_event; + HRESULT hres; + + trace("createEvent tests...\n"); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IDocumentEvent, (void**)&doc_event); + ok(hres == S_OK, "Could not get IDocumentEvent iface: %08x\n", hres); + + IDocumentEvent_Release(doc_event); +} + static HRESULT QueryInterface(REFIID,void**); static HRESULT WINAPI InPlaceFrame_QueryInterface(IOleInPlaceFrame *iface, REFIID riid, void **ppv) @@ -3201,6 +3214,8 @@ START_TEST(events) run_test(empty_doc_str, test_submit); run_test(empty_doc_ie9_str, test_submit); run_test(iframe_doc_str, test_iframe_connections); + if(is_ie9plus) + run_test(empty_doc_ie9_str, test_create_event); test_empty_document();

1 0

Andrey Gusev : kernel32/tests: Remove redundant comparison.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: wine Branch: master Commit: c9e37d8142ff47f7283d4570252f1cd22b719a9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9e37d8142ff47f7283d45702… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Oct 11 20:06:26 2017 +0300 kernel32/tests: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 07daea8..db7bf14 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3619,7 +3619,7 @@ static void test_ProcThreadAttributeList(void) ok(GetLastError() == ERROR_OBJECT_NAME_EXISTS, "got %d\n", GetLastError()); ret = pUpdateProcThreadAttribute(&list, 0, PROC_THREAD_ATTRIBUTE_IDEAL_PROCESSOR, handles, sizeof(PROCESSOR_NUMBER), NULL, NULL); - ok(ret || (!ret && GetLastError() == ERROR_NOT_SUPPORTED), "got %d gle %d\n", ret, GetLastError()); + ok(ret || GetLastError() == ERROR_NOT_SUPPORTED, "got %d gle %d\n", ret, GetLastError()); if (ret) {

1 0

Nikolay Sivov : gdiplus/tests: Test EMF+ records flags.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: wine Branch: master Commit: 1df5f2fab7d5f61a6ce55393128ab3a2241edd09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1df5f2fab7d5f61a6ce553931… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 10 21:24:38 2017 +0300 gdiplus/tests: Test EMF+ records flags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 422 ++++++++++++++++++++++-------------------- 1 file changed, 219 insertions(+), 203 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1df5f2fab7d5f61a6ce55…

1 0

Nikolay Sivov : gdiplus/metafile: Fix flags handling for EMF+ property records.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: wine Branch: master Commit: 30ba465786a92617f93cbd2237030b0a51ae0bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30ba465786a92617f93cbd223… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 10 21:24:39 2017 +0300 gdiplus/metafile: Fix flags handling for EMF+ property records. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index d135e36..350925e 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1834,15 +1834,15 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, } case EmfPlusRecordTypeSetPixelOffsetMode: { - return GdipSetPixelOffsetMode(real_metafile->playback_graphics, (flags >> 8) & 0xf); + return GdipSetPixelOffsetMode(real_metafile->playback_graphics, flags & 0xff); } case EmfPlusRecordTypeSetCompositingQuality: { - return GdipSetCompositingQuality(real_metafile->playback_graphics, (flags >> 8) & 0xf); + return GdipSetCompositingQuality(real_metafile->playback_graphics, flags & 0xff); } case EmfPlusRecordTypeSetInterpolationMode: { - return GdipSetInterpolationMode(real_metafile->playback_graphics, (flags >> 8) & 0xf); + return GdipSetInterpolationMode(real_metafile->playback_graphics, flags & 0xff); } default: FIXME("Not implemented for record type %x\n", recordType);

1 0

Nikolay Sivov : gdiplus/metafile: Support playback for EmfPlusRecordTypeSetTextRenderingHint.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: wine Branch: master Commit: 6010b52a2e7c231665cda5f934ba31abea1aedfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6010b52a2e7c231665cda5f93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 10 21:24:40 2017 +0300 gdiplus/metafile: Support playback for EmfPlusRecordTypeSetTextRenderingHint. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 350925e..e4e61ee 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1844,6 +1844,10 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { return GdipSetInterpolationMode(real_metafile->playback_graphics, flags & 0xff); } + case EmfPlusRecordTypeSetTextRenderingHint: + { + return GdipSetTextRenderingHint(real_metafile->playback_graphics, flags & 0xff); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

Nikolay Sivov : gdiplus/metafile: Support playback for EmfPlusRecordTypeSetAntiAliasMode.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: wine Branch: master Commit: 4b028bb09cb9563e111fedab0f4c3663dc278d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b028bb09cb9563e111fedab0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 10 21:24:41 2017 +0300 gdiplus/metafile: Support playback for EmfPlusRecordTypeSetAntiAliasMode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index e4e61ee..ecfbab2 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1848,6 +1848,10 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { return GdipSetTextRenderingHint(real_metafile->playback_graphics, flags & 0xff); } + case EmfPlusRecordTypeSetAntiAliasMode: + { + return GdipSetSmoothingMode(real_metafile->playback_graphics, (flags >> 1) & 0xff); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

Francois Gouget : testbot: Fix a check for reverting VMs on the Engine startup.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: tools Branch: master Commit: fd5d3d4f40f2b5ceb103832ea25b2bc0e0c90076 URL: http://source.winehq.org/git/tools.git/?a=commit;h=fd5d3d4f40f2b5ceb103832e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 10 23:56:26 2017 +0200 testbot: Fix a check for reverting VMs on the Engine startup. If the Engine was starting up while a VM was reverting, it would power off that VM instead of letting the revert run its course. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 34d29f6..ee496e2 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -195,7 +195,7 @@ sub Cleanup(;$$) next; } elsif (($VM->Status eq "reverting" or $VM->Status eq "sleeping") and - defined $VM->ChildPid and kill(0, $VM->ChildPid)) + defined $VM->ChildPid and !kill(0, $VM->ChildPid)) { # This VM is still being reverted. Let that process run its course. LogMsg "$VMKey is being reverted\n";

1 0

Francois Gouget : testbot: Remove redundant calls to RescheduleJobs().
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: tools Branch: master Commit: 1ae97e538a6dbfbc6a3b96bcaa5866f333f027ee URL: http://source.winehq.org/git/tools.git/?a=commit;h=1ae97e538a6dbfbc6a3b96bc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 10 23:56:44 2017 +0200 testbot: Remove redundant calls to RescheduleJobs(). Modifying a VM's Status field already triggers a rescheduling ($VM->Save() triggers $VM->OnSaved() which calls VMStatusChange() to notify the Engine's HandleVMStatusChange() which calls ScheduleJobs()). So there is no need to call RescheduleJobs() right after saving the VM's new status. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 1 - testbot/bin/WineRunReconfig.pl | 1 - testbot/bin/WineRunTask.pl | 1 - 3 files changed, 3 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 326ac0c..85fe568 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -241,7 +241,6 @@ sub WrapUpAndExit($;$) { $VM->Status($NewVMStatus); $VM->Save(); - RescheduleJobs(); } my $Result = $VM->Name .": ". $VM->Status ." Status: $Status Failures: ". (defined $TestFailures ? $TestFailures : "unset"); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index d8e007d..b2071cd 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -242,7 +242,6 @@ sub WrapUpAndExit($;$) { $VM->Status($NewVMStatus); $VM->Save(); - RescheduleJobs(); } my $Result = $VM->Name .": ". $VM->Status ." Status: $Status Failures: ". (defined $TestFailures ? $TestFailures : "unset"); diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 618ef8f..2328b31 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -270,7 +270,6 @@ sub WrapUpAndExit($;$$) { $VM->Status($NewVMStatus); $VM->Save(); - RescheduleJobs(); } if ($Status eq 'completed' and $Step->Type eq 'suite')

1 0

Francois Gouget : testbot: Tweak the scripts so they print error messages on stderr by default.
by Alexandre Julliard 11 Oct '17

11 Oct '17

Module: tools Branch: master Commit: 9efe233073c826b5dffe3bcb145bc1d982d3aa0d URL: http://source.winehq.org/git/tools.git/?a=commit;h=9efe233073c826b5dffe3bcb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 10 23:56:51 2017 +0200 testbot: Tweak the scripts so they print error messages on stderr by default. When the scripts are started by the Engine their stderr is redirected to the log in order to also capture Perl errors. Since the scripts always log error messages, to avoid getting duplicates they were only printing errors to stderr if given the --debug option. As a result usage errors were not printed by default. So the scripts now print the messages to stderr by default and the Engine can invoke them with the --log-only option where needed to avoid the stderr duplicates. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 9 +++++++-- testbot/bin/WineRunBuild.pl | 9 +++++++-- testbot/bin/WineRunReconfig.pl | 9 +++++++-- testbot/bin/WineRunTask.pl | 9 +++++++-- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/lib/WineTestBot/VMs.pm | 2 +- 6 files changed, 30 insertions(+), 10 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index aa256f3..358eebf 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -51,9 +51,10 @@ sub Debug(@) print STDERR @_ if ($Debug); } +my $LogOnly; sub Error(@) { - Debug("$Name0:error: ", @_); + print STDERR "$Name0:error: ", @_ if (!$LogOnly); LogMsg @_; } @@ -99,6 +100,10 @@ while (@ARGV) { $Debug = 1; } + elsif ($Arg eq "--log-only") + { + $LogOnly = 1; + } elsif ($Arg eq "revert") { $Action = $Arg; @@ -158,7 +163,7 @@ if (!defined $Usage) } if (defined $Usage) { - print "Usage: $Name0 [--debug] [--help] revert VMName\n"; + print "Usage: $Name0 [--debug] [--log-only] [--help] revert VMName\n"; exit $Usage; } diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 85fe568..f385fee 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -54,9 +54,10 @@ sub Debug(@) print STDERR @_ if ($Debug); } +my $LogOnly; sub Error(@) { - Debug("$Name0:error: ", @_); + print STDERR "$Name0:error: ", @_ if (!$LogOnly); LogMsg @_; } @@ -88,6 +89,10 @@ while (@ARGV) { $Debug = 1; } + elsif ($Arg eq "--log-only") + { + $LogOnly = 1; + } elsif ($Arg =~ /^(?:-\?|-h|--help)$/) { $Usage = 0; @@ -130,7 +135,7 @@ if (!defined $Usage) } if (defined $Usage) { - print "Usage: $Name0 [--debug] [--help] JobId StepNo TaskNo\n"; + print "Usage: $Name0 [--debug] [--log-only] [--help] JobId StepNo TaskNo\n"; exit $Usage; } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index b2071cd..aa529a2 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -54,9 +54,10 @@ sub Debug(@) print STDERR @_ if ($Debug); } +my $LogOnly; sub Error(@) { - Debug("$Name0:error: ", @_); + print STDERR "$Name0:error: ", @_ if (!$LogOnly); LogMsg @_; } @@ -88,6 +89,10 @@ while (@ARGV) { $Debug = 1; } + elsif ($Arg eq "--log-only") + { + $LogOnly = 1; + } elsif ($Arg =~ /^(?:-\?|-h|--help)$/) { $Usage = 0; @@ -130,7 +135,7 @@ if (!defined $Usage) } if (defined $Usage) { - print "Usage: $Name0 [--debug] [--help] JobId StepNo TaskNo\n"; + print "Usage: $Name0 [--debug] [--log-only] [--help] JobId StepNo TaskNo\n"; exit $Usage; } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 2328b31..fc0bcf3 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -53,9 +53,10 @@ sub Debug(@) print STDERR @_ if ($Debug); } +my $LogOnly; sub Error(@) { - Debug("$Name0:error: ", @_); + print STDERR "$Name0:error: ", @_ if (!$LogOnly); LogMsg @_; } @@ -113,6 +114,10 @@ while (@ARGV) { $Debug = 1; } + elsif ($Arg eq "--log-only") + { + $LogOnly = 1; + } elsif ($Arg =~ /^(?:-\?|-h|--help)$/) { $Usage = 0; @@ -155,7 +160,7 @@ if (!defined $Usage) } if (defined $Usage) { - print "Usage: $Name0 [--debug] [--help] JobId StepNo TaskNo\n"; + print "Usage: $Name0 [--debug] [--log-only] [--help] JobId StepNo TaskNo\n"; exit $Usage; } diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 520d403..b4298fb 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -128,7 +128,7 @@ sub Run($$) } $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; - exec("$BinDir/${ProjectName}$RunScript", $JobId, $StepNo, $TaskNo) or + exec("$BinDir/${ProjectName}$RunScript", "--log-only", $JobId, $StepNo, $TaskNo) or require WineTestBot::Log; WineTestBot::Log::LogMsg("Unable to exec ${ProjectName}$RunScript: $!\n"); exit(1); diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 1c6cdd7..af052d9 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -276,7 +276,7 @@ sub RunRevert($) delete $ENV{ENV}; require WineTestBot::Log; WineTestBot::Log::SetupRedirects(); - exec("$BinDir/LibvirtTool.pl", "revert", $self->GetKey()) or + exec("$BinDir/LibvirtTool.pl", "--log-only", "revert", $self->GetKey()) or WineTestBot::Log::LogMsg("Unable to exec LibvirtTool.pl: $!\n"); exit(1); }

1 0