From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [OSSTEST PATCH 1/2] poll_loop: Restore diversion of logm Date: Tue, 4 Nov 2014 17:36:50 +0000 Message-ID: <1415122612-5714-1-git-send-email-ian.jackson@eu.citrix.com> References: <21593.3655.232310.365186@mariner.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xli2S-0003yo-RY for xen-devel@lists.xenproject.org; Tue, 04 Nov 2014 17:37:04 +0000 In-Reply-To: <21593.3655.232310.365186@mariner.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Ian.Campbell@citrix.com, JBeulich@suse.com List-Id: xen-devel@lists.xenproject.org poll_loop is supposed to divert the logging away so that you don't have to see a pile of repetitive logging if the operation succeeds. But this was broken when the code was moved from the perl module Osstest to Osstest::TestSupport. Fix it. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 1d77933..ef2a853 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -611,7 +611,7 @@ sub poll_loop ($$$&) { $logmtmpfile= IO::File::new_tmpfile or die $!; if (!eval { - local ($Osstest::logm_handle) = ($logmtmpfile); + local ($Osstest::TestSupport::logm_handle) = ($logmtmpfile); $bad= $code->(); 1; }) { -- 1.7.10.4