summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnanth N Mavinakayanahalli <ananth@in.ibm.com>2009-05-28 11:48:34 +0530
committerAnanth N Mavinakayanahalli <ananth@in.ibm.com>2009-05-28 11:48:34 +0530
commit4cef6bf2c2d86dd3558065784691061793979425 (patch)
tree87c9a9d704e06c8ea47a657118064b4a1f2c7a60
parent2ed04863c3426f94932d4a4e4b5d6c7b84e49dfd (diff)
downloadsystemtap-steved-4cef6bf2c2d86dd3558065784691061793979425.tar.gz
systemtap-steved-4cef6bf2c2d86dd3558065784691061793979425.tar.xz
systemtap-steved-4cef6bf2c2d86dd3558065784691061793979425.zip
More testsuite tweaks to make it work with SYSCALL_WRAPPERS
-rwxr-xr-xtestsuite/buildok/thirtyone.stp6
-rwxr-xr-xtestsuite/semok/twentyeight.stp2
-rwxr-xr-xtestsuite/semok/twentyfour.stp4
-rw-r--r--testsuite/systemtap.base/debugpath.exp4
-rwxr-xr-xtestsuite/systemtap.base/poll_map.stp2
5 files changed, 9 insertions, 9 deletions
diff --git a/testsuite/buildok/thirtyone.stp b/testsuite/buildok/thirtyone.stp
index 5f2f2da6..a3afd519 100755
--- a/testsuite/buildok/thirtyone.stp
+++ b/testsuite/buildok/thirtyone.stp
@@ -1,5 +1,5 @@
#! stap -p4
-probe kprobe.function("sys_stat") {}
-probe kprobe.function("sys_open") {}
-probe kernel.function("sys_close") {}
+probe kprobe.function("vfs_stat") {}
+probe kprobe.function("do_sys_open") {}
+probe kernel.function("filp_close") {}
diff --git a/testsuite/semok/twentyeight.stp b/testsuite/semok/twentyeight.stp
index f9854134..c4a8621f 100755
--- a/testsuite/semok/twentyeight.stp
+++ b/testsuite/semok/twentyeight.stp
@@ -1,4 +1,4 @@
#! stap -p2
# Make sure wildcards are handled
-probe kerne*.funct*("sys_read").* {}
+probe kerne*.funct*("vfs_read").* {}
diff --git a/testsuite/semok/twentyfour.stp b/testsuite/semok/twentyfour.stp
index 91dee48f..d42496bf 100755
--- a/testsuite/semok/twentyfour.stp
+++ b/testsuite/semok/twentyfour.stp
@@ -2,7 +2,7 @@
# read access to target variables should work in .return probes
-probe kernel.function("sys_read").return
+probe kernel.function("vfs_read").return
{
- printf("fd is %d\n", $fd)
+ printf("count is %d\n", $count)
}
diff --git a/testsuite/systemtap.base/debugpath.exp b/testsuite/systemtap.base/debugpath.exp
index b0f938b6..059b6b07 100644
--- a/testsuite/systemtap.base/debugpath.exp
+++ b/testsuite/systemtap.base/debugpath.exp
@@ -1,6 +1,6 @@
set test "debugpath-bad"
-spawn env SYSTEMTAP_DEBUGINFO_PATH=/dev/null stap -e "probe kernel.function(\"sys_open\") {}" -wp4
+spawn env SYSTEMTAP_DEBUGINFO_PATH=/dev/null stap -e "probe kernel.function(\"vfs_read\") {}" -wp4
expect {
-re {^semantic error:.*missing.*debuginfo} { pass $test }
timeout { fail "$test (timeout1)" }
@@ -21,7 +21,7 @@ if [file isdirectory /usr/lib/debug] {
set debuginfo_path "/lib/modules/$uname"
}
-spawn env SYSTEMTAP_DEBUGINFO_PATH=$debuginfo_path stap -e "probe kernel.function(\"sys_open\") {}" -wp2
+spawn env SYSTEMTAP_DEBUGINFO_PATH=$debuginfo_path stap -e "probe kernel.function(\"vfs_read\") {}" -wp2
expect {
-re {kernel.function.*pc=} { pass $test }
timeout { fail "$test (timeout2)" }
diff --git a/testsuite/systemtap.base/poll_map.stp b/testsuite/systemtap.base/poll_map.stp
index cd39b433..e278fc91 100755
--- a/testsuite/systemtap.base/poll_map.stp
+++ b/testsuite/systemtap.base/poll_map.stp
@@ -5,7 +5,7 @@
global called, num_polls
-probe kernel.function( "sys_*" ).call {
+probe kernel.function( "vfs_*" ).call {
called[execname(),probefunc()]++
}