summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWenji Huang <wenji.huang@oracle.com>2009-11-23 16:38:04 +0800
committerWenji Huang <wenji.huang@oracle.com>2009-11-23 16:38:04 +0800
commitfad409cab6527b17dcc15a81505113606b8d4ed4 (patch)
treefe294c2911334b633531057fba62bd8c374e56d0
parentb28d67e28087f208ecfd888b4518bb9efb2bf552 (diff)
downloadsystemtap-steved-fad409cab6527b17dcc15a81505113606b8d4ed4.tar.gz
systemtap-steved-fad409cab6527b17dcc15a81505113606b8d4ed4.tar.xz
systemtap-steved-fad409cab6527b17dcc15a81505113606b8d4ed4.zip
Tweak cu-decl test
* testsuite/systemtap.base/cu-decl.exp: Check utrace. * testsuite/lib/stap_compile.exp: Make catch after wait.
-rw-r--r--testsuite/lib/stap_compile.exp2
-rw-r--r--testsuite/systemtap.base/cu-decl.exp8
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}