2 files changed, 24 insertions, 8 deletions
diff --git a/testsuite/systemtap.base/tracepoints.exp b/testsuite/systemtap.base/tracepoints.exp
index a4e38c05..b9014208 100644
--- a/testsuite/systemtap.base/tracepoints.exp
+++ b/testsuite/systemtap.base/tracepoints.exp
@@ -2,6 +2,7 @@
 set tracepoints {}
 spawn stap -l {kernel.trace("*")}
 expect {
+    -timeout 60
     -re {^kernel.trace[^\r\n]*\r\n} {
         append tracepoints $expect_out(0,string)
         exp_continue
@@ -11,13 +12,26 @@ expect {
 }
 catch {close}; catch { wait }
 
+# Use this to test each tracepoint individually.
+#foreach tp $tracepoints {
+#    set test "tracepoint $tp -p4"
+#    if {[catch {exec stap -w -p4 -e "probe $tp { println($\$name, $\$vars) }"} res]} {
+#        fail "$test $res"
+#    } else {
+#        pass "$test"
+#    }
+#}
+
+# This tests all tracepoints all at once (much faster than the above)
+set script "probe begin {}"
 foreach tp $tracepoints {
-    set test "tracepoint $tp -p4"
-    if {[catch {exec stap -w -p4 -e "probe $tp { println($\$name, $\$vars) }"} res]} {
-        fail "$test $res"
-    } else {
-        pass "$test"
-    }
+	set script "$script probe $tp { println($\$name, $\$vars) }"
+}
+send_log "Trying stap -w -p4 -e $script\n"
+if {[catch {exec stap -w -p4 -e "$script"} res]} {
+	fail "tracepoints $res"
+} else {
+	pass "tracepoints"
 }
 
 set test "tracepoints"
diff --git a/testsuite/systemtap.base/utrace_syscall_args.exp b/testsuite/systemtap.base/utrace_syscall_args.exp
index 98bc457e..e3c90191 100644
--- a/testsuite/systemtap.base/utrace_syscall_args.exp
+++ b/testsuite/systemtap.base/utrace_syscall_args.exp
@@ -37,7 +37,8 @@ if {$do_64_bit_pass} {
     set res [target_compile $srcpath $exepath executable $flags]
     if { $res != "" } {
 	verbose "target_compile for $exepath failed: $res" 2
-	fail "$testname: unable to compile $srcpath"
+	send_log "$testname: unable to compile $srcpath\n"
+	untested $testname       
 	return
     }
 
@@ -72,7 +73,8 @@ if {$do_32_bit_pass} {
     set res [target_compile $srcpath $exepath executable $flags]
     if { $res != "" } {
 	verbose "target_compile for $exepath failed: $res" 2
-	fail "$testname: unable to compile $srcpath"
+	send_log "$testname: unable to compile $srcpath\n"
+	untested $testname       
 	return
     }