2006-09-09 Frank Ch. Eigler <fche@elastic.org>

	* lib/systemtap.exp (stap_run_batch): New helper routine.
	* systemtap.pass1-4/*.exp: Use it instead of catch/exec/>>& hack.

10 files changed, 30 insertions, 17 deletions

diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index ee5664ca..73f38e2b 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-09  Frank Ch. Eigler  <fche@elastic.org>
+
+	* lib/systemtap.exp (stap_run_batch): New helper routine.
+	* systemtap.pass1-4/*.exp: Use it instead of catch/exec/>>& hack.
+
 2006-09-06  Frank Ch. Eigler  <fche@elastic.org>
 
 	* parseok/eighteen.stp, semok/twentythree.stp: New files for
diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp
index 6bb578b4..888c685d 100644
--- a/testsuite/lib/systemtap.exp
+++ b/testsuite/lib/systemtap.exp
@@ -54,8 +54,16 @@ proc setup_systemtap_environment {} {
 setup_systemtap_environment
 print_systemtap_version
 
-
 proc systemtap_init {args} {}
 proc systemtap_version {} {}
 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 { } }
+    set results [wait]
+    verbose -log "wait results: $results"
+    return [lindex $results 3]
+}
\ No newline at end of file
diff --git a/testsuite/systemtap.pass1-4/buildko.exp b/testsuite/systemtap.pass1-4/buildko.exp
index 1a208fa6..d82a18c3 100644
--- a/testsuite/systemtap.pass1-4/buildko.exp
+++ b/testsuite/systemtap.pass1-4/buildko.exp
@@ -2,7 +2,7 @@ set self buildko
 foreach file [lsort [glob -nocomplain $srcdir/$self/*.stp]] {
     set test $self/[file tail $file]
     verbose -log "Running $file"
-    set rc [catch {exec $file >>& systemtap.log} err]
+    set rc [stap_run_batch $file]
     setup_xfail *-*-*
-    if {$rc == 0} { pass $test } else { fail "$test rc $rc" }
+    if {$rc == 0} { pass $test } else { fail $test }
 }
diff --git a/testsuite/systemtap.pass1-4/buildok.exp b/testsuite/systemtap.pass1-4/buildok.exp
index 35c0e6c6..657f8558 100644
--- a/testsuite/systemtap.pass1-4/buildok.exp
+++ b/testsuite/systemtap.pass1-4/buildok.exp
@@ -2,7 +2,7 @@ set self buildok
 foreach file [lsort [glob -nocomplain $srcdir/$self/*.stp]] {
     set test $self/[file tail $file]
     verbose -log "Running $file"
-    set rc [catch {exec $file >>& systemtap.log} err]
+    set rc [stap_run_batch $file]
     # some tests are known to fail.
     switch $test {
         buildok/sched_test.stp {setup_kfail 1155 *-*-*}
@@ -10,5 +10,5 @@ foreach file [lsort [glob -nocomplain $srcdir/$self/*.stp]] {
         buildok/process_test.stp {setup_kfail 9999 *-*-*}
         buildok/syscall.stp {setup_kfail 9999 *-*-*}
     }
-    if {$rc == 0} { pass $test } else { fail "$test rc $rc" }
+    if {$rc == 0} { pass $test } else { fail $test }
 }
diff --git a/testsuite/systemtap.pass1-4/parseko.exp b/testsuite/systemtap.pass1-4/parseko.exp
index c69c3e27..e383a12e 100644
--- a/testsuite/systemtap.pass1-4/parseko.exp
+++ b/testsuite/systemtap.pass1-4/parseko.exp
@@ -2,7 +2,7 @@ set self parseko
 foreach file [lsort [glob -nocomplain $srcdir/$self/*.stp]] {
     set test $self/[file tail $file]
     verbose -log "Running $file"
-    set rc [catch {exec $file >>& systemtap.log} err]
+    set rc [stap_run_batch $file]
     setup_xfail *-*-*
-    if {$rc == 0} { pass $test } else { fail "$test rc $rc" }
+    if {$rc == 0} { pass $test } else { fail $test }
 }
diff --git a/testsuite/systemtap.pass1-4/parseok.exp b/testsuite/systemtap.pass1-4/parseok.exp
index 56d287b9..e96e74f2 100644
--- a/testsuite/systemtap.pass1-4/parseok.exp
+++ b/testsuite/systemtap.pass1-4/parseok.exp
@@ -2,6 +2,6 @@ set self parseok
 foreach file [lsort [glob -nocomplain $srcdir/$self/*.stp]] {
     set test $self/[file tail $file]
     verbose -log "Running $file"
-    set rc [catch {exec $file >>& systemtap.log} err]
-    if {$rc == 0} { pass $test } else { fail "$test rc $rc" }
+    set rc [stap_run_batch $file]
+    if {$rc == 0} { pass $test } else { fail $test }
 }
diff --git a/testsuite/systemtap.pass1-4/semko.exp b/testsuite/systemtap.pass1-4/semko.exp
index 020d48b4..aa53f324 100644
--- a/testsuite/systemtap.pass1-4/semko.exp
+++ b/testsuite/systemtap.pass1-4/semko.exp
@@ -2,7 +2,7 @@ set self semko
 foreach file [lsort [glob -nocomplain $srcdir/$self/*.stp]] {
     set test $self/[file tail $file]
     verbose -log "Running $file"
-    set rc [catch {exec $file >>& systemtap.log} err]
+    set rc [stap_run_batch $file]
     setup_xfail *-*-*
-    if {$rc == 0} { pass $test } else { fail "$test rc $rc" }
+    if {$rc == 0} { pass $test } else { fail $test }
 }
diff --git a/testsuite/systemtap.pass1-4/semok.exp b/testsuite/systemtap.pass1-4/semok.exp
index f02c8643..b32b6d4e 100644
--- a/testsuite/systemtap.pass1-4/semok.exp
+++ b/testsuite/systemtap.pass1-4/semok.exp
@@ -2,6 +2,6 @@ set self semok
 foreach file [lsort [glob -nocomplain $srcdir/$self/*.stp]] {
     set test $self/[file tail $file]
     verbose -log "Running $file"
-    set rc [catch {exec $file >>& systemtap.log} err]
-    if {$rc == 0} { pass $test } else { fail "$test rc $rc" }
+    set rc [stap_run_batch $file]
+    if {$rc == 0} { pass $test } else { fail $test }
 }
diff --git a/testsuite/systemtap.pass1-4/transko.exp b/testsuite/systemtap.pass1-4/transko.exp
index 8aa5bec8..e4b9b138 100644
--- a/testsuite/systemtap.pass1-4/transko.exp
+++ b/testsuite/systemtap.pass1-4/transko.exp
@@ -2,7 +2,7 @@ set self transko
 foreach file [lsort [glob -nocomplain $srcdir/$self/*.stp]] {
     set test $self/[file tail $file]
     verbose -log "Running $file"
-    set rc [catch {exec $file >>& systemtap.log} err]
+    set rc [stap_run_batch $file]
     setup_xfail *-*-*
-    if {$rc == 0} { pass $test } else { fail "$test rc $rc" }
+    if {$rc == 0} { pass $test } else { fail $test }
 }
diff --git a/testsuite/systemtap.pass1-4/transok.exp b/testsuite/systemtap.pass1-4/transok.exp
index 1594e485..0b94ee9c 100644
--- a/testsuite/systemtap.pass1-4/transok.exp
+++ b/testsuite/systemtap.pass1-4/transok.exp
@@ -2,6 +2,6 @@ set self transok
 foreach file [lsort [glob -nocomplain $srcdir/$self/*.stp]] {
     set test $self/[file tail $file]
     verbose -log "Running $file"
-    set rc [catch {exec $file >>& systemtap.log} err]
-    if {$rc == 0} { pass $test } else { fail "$test rc $rc" }
+    set rc [stap_run_batch $file]
+    if {$rc == 0} { pass $test } else { fail $test }
 }