From 73812da575ff92ea388c8bb16e42a9c5aaa6ee20 Mon Sep 17 00:00:00 2001
From: David Smith <dsmith@redhat.com>
Date: Thu, 20 Aug 2009 16:54:06 -0500
Subject: [PATCH] Two minor testcase fixes. *
 testsuite/systemtap.base/global_stat.exp: Improved error handling. *
 testsuite/systemtap.base/strftime.exp: Ditto.

---
 testsuite/systemtap.base/global_stat.exp | 2 +-
 testsuite/systemtap.base/strftime.exp    | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/testsuite/systemtap.base/global_stat.exp b/testsuite/systemtap.base/global_stat.exp
index 704556f60..8517785b9 100644
--- a/testsuite/systemtap.base/global_stat.exp
+++ b/testsuite/systemtap.base/global_stat.exp
@@ -10,4 +10,4 @@ expect {
     timeout {fail "global_stat: unexpected timeout"}
     eof {fail "global_stat: unexpected EOF"}
 }
-wait;close
+wait; catch { close }
diff --git a/testsuite/systemtap.base/strftime.exp b/testsuite/systemtap.base/strftime.exp
index decd7a659..51fa0dccb 100644
--- a/testsuite/systemtap.base/strftime.exp
+++ b/testsuite/systemtap.base/strftime.exp
@@ -5,7 +5,8 @@ system "rm -f %*"
 
 # check %S and %T
 set format %%%S_%T
-exec stap -o $format -we {probe begin {println("hello");exit()}}
+catch { exec stap -o $format -we {probe begin {println("hello");exit()}} } res
+verbose -log $res
 
 set file [glob -nocomplain -types f %\[0-9\]\[0-9\]_\[0-9\]\[0-9\]:\[0-9\]\[0-9\]:\[0-9\]\[0-9\]]
 
@@ -20,7 +21,8 @@ set format %%,%C,%Y,%y,%m,%d,%e,%F,%H,%I,%j,%k,%l,%M,%R,%u,%w
 
 set date1 [exec date +$format]
 # run stapio with strftime
-exec stap -o $format -we {probe begin {println("hello");exit()}}
+catch { exec stap -o $format -we {probe begin {println("hello");exit()}} } res
+verbose -log $res
 
 if {[file exists $date1]} {
   pass "$test (except %S and %T)"
-- 
2.43.5