From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Jackson <ian.jackson@eu.citrix.com>
Subject: [OSSTEST PATCH 2/2] osstest-confirm-booted: Log
	processes
Date: Tue, 4 Nov 2014 17:36:51 +0000
Message-ID: <1415122612-5714-2-git-send-email-ian.jackson@eu.citrix.com>
References: <21593.3655.232310.365186@mariner.uk.xensource.com>
	<1415122612-5714-1-git-send-email-ian.jackson@eu.citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta5.messagelabs.com ([195.245.231.135])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <Ian.Jackson@citrix.com>) id 1Xli2T-0003yt-Gf
	for xen-devel@lists.xenproject.org; Tue, 04 Nov 2014 17:37:05 +0000
In-Reply-To: <1415122612-5714-1-git-send-email-ian.jackson@eu.citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=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.Jackson@eu.citrix.com>, Ian.Campbell@citrix.com, JBeulich@suse.com
List-Id: xen-devel@lists.xenproject.org

Run a ps if osstest-confirm-booted does not exist, and stash the
output where we read it during log capture.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 Osstest/TestSupport.pm |    7 ++++---
 ts-logs-capture        |    2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index ef2a853..b348a7e 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -914,9 +914,10 @@ sub host_reboot ($) {
     poll_loop(40,2, 'reboot-confirm-booted', sub {
         my $output;
         if (!eval {
-            $output= target_cmd_output($ho,
-                "stat /dev/shm/osstest-confirm-booted 2>&1 >/dev/null ||:",
-                                       40);
+            $output= target_cmd_output($ho, <<END, 40);
+stat /dev/shm/osstest-confirm-booted 2>&1 >/dev/null \\
+ || ps -efH >osstest-confirm-booted.log
+END
             1;
         }) {
             return $@;
diff --git a/ts-logs-capture b/ts-logs-capture
index 3ccfc00..21974a9 100755
--- a/ts-logs-capture
+++ b/ts-logs-capture
@@ -130,6 +130,8 @@ sub fetch_logs_host_guests () {
 
                   /etc/xen/*
 
+                  /home/osstest/osstest-confirm-booted.log
+
                   )];
     if (!try_fetch_logs($ho, $logs)) {
         logm("log fetching failed, trying hard host reboot...");
-- 
1.7.10.4