summaryrefslogtreecommitdiffstats
path: root/testsuite/lib
diff options
context:
space:
mode:
authorfche <fche>2006-09-10 01:01:22 +0000
committerfche <fche>2006-09-10 01:01:22 +0000
commitbbbce0173fc3721a430dde7ce1a8da8f65d1737d (patch)
treebe8179b69f6f07007346b9099d43ae9dbb563944 /testsuite/lib
parent0ecbca4cb58a9fc7057ff44cc4693010e7c3c7b7 (diff)
downloadsystemtap-steved-bbbce0173fc3721a430dde7ce1a8da8f65d1737d.tar.gz
systemtap-steved-bbbce0173fc3721a430dde7ce1a8da8f65d1737d.tar.xz
systemtap-steved-bbbce0173fc3721a430dde7ce1a8da8f65d1737d.zip
* tolerate long-running jobs better in stap_run_batch ()
Diffstat (limited to 'testsuite/lib')
-rw-r--r--testsuite/lib/systemtap.exp6
1 files changed, 5 insertions, 1 deletions
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]