From fad409cab6527b17dcc15a81505113606b8d4ed4 Mon Sep 17 00:00:00 2001
From: Wenji Huang <wenji.huang@oracle.com>
Date: Mon, 23 Nov 2009 16:38:04 +0800
Subject: Tweak cu-decl test

* testsuite/systemtap.base/cu-decl.exp: Check utrace.
* testsuite/lib/stap_compile.exp: Make catch after wait.
---
 testsuite/lib/stap_compile.exp       | 2 +-
 testsuite/systemtap.base/cu-decl.exp | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/testsuite/lib/stap_compile.exp b/testsuite/lib/stap_compile.exp
index c8d44203..8780930e 100644
--- a/testsuite/lib/stap_compile.exp
+++ b/testsuite/lib/stap_compile.exp
@@ -19,8 +19,8 @@ proc stap_compile { TEST_NAME compile script args } {
 	-re "compilation failed" {incr compile_errors 1; exp_continue}
 	-re "semantic error:" {incr compile_errors 1; exp_continue}
     }
-    catch close
     set res [wait -i $spawn_id]
+    catch close
     set res [lindex $res 3]
 
     if {($res == 0 && $compile_errors == 0)
diff --git a/testsuite/systemtap.base/cu-decl.exp b/testsuite/systemtap.base/cu-decl.exp
index 42e683cb..ae06ad85 100644
--- a/testsuite/systemtap.base/cu-decl.exp
+++ b/testsuite/systemtap.base/cu-decl.exp
@@ -17,7 +17,9 @@ if { $res != "" } {
 } else {
     pass "$test target compilation"
 }
-
-stap_compile $test 1 "{$script}"
-
+if {![utrace_p]} {
+    untested "$test : no kernel utrace support found"
+} else {
+    stap_compile $test 1 "{$script}"
+}
 catch {exec rm $test}
-- 
cgit