summaryrefslogtreecommitdiffstats
path: root/testsuite/lib
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>2009-04-01 18:12:10 -0700
committerRoland McGrath <roland@redhat.com>2009-04-01 18:12:10 -0700
commit976c562d2da11592305260c6ed06d098b81dd491 (patch)
tree6180b861705834af410e414fca01215df9fba382 /testsuite/lib
parent3c960a7cfa61cbde19c0ad88045c8c1f6405ed87 (diff)
parent83ff01c2f669c66100a5cf7531dda9410a8ff6ce (diff)
downloadsystemtap-steved-976c562d2da11592305260c6ed06d098b81dd491.tar.gz
systemtap-steved-976c562d2da11592305260c6ed06d098b81dd491.tar.xz
systemtap-steved-976c562d2da11592305260c6ed06d098b81dd491.zip
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'testsuite/lib')
-rw-r--r--testsuite/lib/stap_run.exp1
-rw-r--r--testsuite/lib/systemtap.exp10
2 files changed, 11 insertions, 0 deletions
diff --git a/testsuite/lib/stap_run.exp b/testsuite/lib/stap_run.exp
index a4beaa12..3043eeed 100644
--- a/testsuite/lib/stap_run.exp
+++ b/testsuite/lib/stap_run.exp
@@ -30,6 +30,7 @@ proc stap_run { TEST_NAME {LOAD_GEN_FUNCTION ""} {OUTPUT_CHECK_STRING ""} args }
if [file readable $test_file_name] {
lappend cmd $test_file_name
}
+ send_log "executing: $cmd\n"
eval spawn $cmd
expect {
-timeout 180
diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp
index 554e88ed..5311be7b 100644
--- a/testsuite/lib/systemtap.exp
+++ b/testsuite/lib/systemtap.exp
@@ -16,6 +16,16 @@ proc use_server_p {} {
}
+proc utrace_p {} {
+ set path "/proc/kallsyms"
+ if {! [catch {exec grep -q utrace_attach $path} dummy]} {
+ return 1
+ } else {
+ return 0
+ }
+}
+
+
proc print_systemtap_version {} {
set version [exec /bin/uname -r]
set location "/boot/vmlinux-$version"