[Xen-devel] [OSSTEST PATCH 2/2] osstest-confirm-booted: Log processes

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

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@xxxxxxxxxxxxx>
---
 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


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel