From bbbce0173fc3721a430dde7ce1a8da8f65d1737d Mon Sep 17 00:00:00 2001
From: fche <fche>
Date: Sun, 10 Sep 2006 01:01:22 +0000
Subject: * tolerate long-running jobs better in stap_run_batch ()

---
 testsuite/lib/systemtap.exp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'testsuite')

diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp
index 888c685d..8465b91f 100644
--- a/testsuite/lib/systemtap.exp
+++ b/testsuite/lib/systemtap.exp
@@ -62,7 +62,11 @@ proc systemtap_exit {} {}
 proc stap_run_batch {args} {
     verbose -log "starting $args"
     spawn $args
-    expect { -re .* { verbose -log $expect_out(1,string); exp_continue } eof { } }
+    expect { 
+        -re {[^\r]*\r} { verbose -log $expect_out(0,string); exp_continue } 
+        eof { }
+        timeout { exp_continue } 
+    }
     set results [wait]
     verbose -log "wait results: $results"
     return [lindex $results 3]
-- 
cgit