summaryrefslogtreecommitdiffstats
path: root/testsuite/lib
diff options
context:
space:
mode:
authorDave Brolley <brolley@redhat.com>2009-04-02 12:38:15 -0400
committerDave Brolley <brolley@redhat.com>2009-04-02 12:38:15 -0400
commit2f53f831393d2f0db3d54260c2a7882eff17905c (patch)
treeba140bbad1fd4acaa7c2253949a2b2ade53952a2 /testsuite/lib
parent2f54c4fe5a3aa21b4d5c38edabf83f3cdad0177d (diff)
parent15a78144473940a4e7c685cc57ba09a92f2293c6 (diff)
downloadsystemtap-steved-2f53f831393d2f0db3d54260c2a7882eff17905c.tar.gz
systemtap-steved-2f53f831393d2f0db3d54260c2a7882eff17905c.tar.xz
systemtap-steved-2f53f831393d2f0db3d54260c2a7882eff17905c.zip
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Conflicts: configure
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"