From patchwork Wed Jun 7 17:48:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 9772111 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5AB836034B for ; Wed, 7 Jun 2017 17:52:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6CE10284C5 for ; Wed, 7 Jun 2017 17:52:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 61AEF284D4; Wed, 7 Jun 2017 17:52:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0F383284C5 for ; Wed, 7 Jun 2017 17:52:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIf5n-0002Zs-Bo; Wed, 07 Jun 2017 17:50:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIf5l-0002Ge-A7 for xen-devel@lists.xenproject.org; Wed, 07 Jun 2017 17:50:01 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id F0/68-02006-8CC38395; Wed, 07 Jun 2017 17:50:00 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpkkeJIrShJLcpLzFFi42JxWrrBXveIjUW kwePrphbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bduYvZC1YLVlw/eYm5gfESbxcjJ4eEgL/E ho4HTCA2m4CuRNOWv2xdjBwcIgIqErf3GoCEmQViJH7N3ARWIiwQJPHl5B6wEhagkhcLHUHCv AKeEievnGeDmCgncf74T2YQm1PAS2L7K4i4EFDNns//wFqFBNQk5q6Ph2gVlDg58wkLxCYJiY MvXjBPYOSdhSQ1C0lqASPTKkb14tSistQiXUO9pKLM9IyS3MTMHF1DA1O93NTi4sT01JzEpGK 95PzcTYzAoKlnYGDcwdjU63yIUZKDSUmU94G0RaQQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCV5m YBAKCRalpqdWpGXmAMMXJi3BwaMkwssJkuYtLkjMLc5Mh0idYlSUEufdZg2UEABJZJTmwbXBY uYSo6yUMC8jAwODEE9BalFuZgmq/CtGcQ5GJWGI8TyZeSVw018BLWYCWsx3yQRkcUkiQkqqgX GxD0O3tFv0uawdUx8t6025PHuVx7KNt/nYe7bdO8rl/Npti2e3WtHdq5PD3illySkd/We6avl fx73a69ms71+aXb0j2L1gUsDR1ZMnfWbpuLLz+irJjd9PZkXJZ/LPnHbFfm/m58/Wk5tXzjpS pnSoQj94mUX9r72XZyzmnej8aLm1ccSxezzPlFiKMxINtZiLihMBhgREZJQCAAA= X-Env-Sender: prvs=3243fba83=Ian.Jackson@citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1496857795!102299222!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3213 invoked from network); 7 Jun 2017 17:49:56 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 7 Jun 2017 17:49:56 -0000 X-IronPort-AV: E=Sophos;i="5.39,311,1493683200"; d="scan'208";a="435520851" From: Ian Jackson To: Date: Wed, 7 Jun 2017 18:48:54 +0100 Message-ID: <1496857742-20191-4-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1496857742-20191-1-git-send-email-ian.jackson@eu.citrix.com> References: <1496857742-20191-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Cc: Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH 03/11] TestSupport: target_cmd_output_root_status: New sub X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Konrad Rzeszutek Wilk Similar to target_cmd_root_status except it outputs both output _and_ status. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Ian Jackson --- v2: Initial posting v3: Sprinkle some comments. v4: Move doc comments out of this patch (and rewrite them). Edit commit message. --- Osstest/TestSupport.pm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index f54962a..fc1aa7d 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -52,7 +52,7 @@ BEGIN { unique_incrementing_runvar next_unique_name stashfilecontents - target_cmd_root_status + target_cmd_root_status target_cmd_output_root_status target_cmd_root target_cmd target_cmd_build target_cmd_output_root target_cmd_output target_cmd_inputfh_root sshuho @@ -708,19 +708,25 @@ sub target_cmd_root_status ($$;$$) { tcmd(undef,undef,1, 'root',@_); } sub tcmdout { my $stdout= IO::File::new_tmpfile(); - tcmd(undef,$stdout,0,@_); + my $badstatusok = $_[1]; + my $rc = tcmd(undef,$stdout,@_); $stdout->seek(0,0) or die "$stdout $!"; my $r; { local ($/) = undef; $r= <$stdout>; } die "$stdout $!" if !defined $r or $stdout->error or !close $stdout; chomp($r); + return ($rc, $r) if $badstatusok; return $r; } # Like target_cmd[_root], but collect the stdout and return it as a string. -sub target_cmd_output ($$;$) { tcmdout('osstest',@_); } -sub target_cmd_output_root ($$;$) { tcmdout('root',@_); } +# Like target_cmd[_root], but collects the stdout and returns it as a string. +sub target_cmd_output ($$;$) { tcmdout(0, 'osstest',@_); } +sub target_cmd_output_root ($$;$) { tcmdout(0, 'root',@_); } + +# Like target_cmd_root_status but returns a tuple ($?, $stdout_data). +sub target_cmd_output_root_status ($$;$$) { tcmdout(1, 'root',@_); } sub target_cmd_inputfh_root ($$$;$$) { my ($tho,$stdinfh,$tcmd,@rest) = @_;