2007-03-09 Pierre Peiffer <pierre.peiffer@bull.net>

	* buildok/twenty.stp, semok/seventeen.stp: Adapt to kernel 2.6.20.

diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index 9da735aac5b67a1103351545e3e0e34fd45790d6..aba7e9a318b9b8faf6b4d12b5bf31fd2e40e25fb 100644 (file)
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-09  Pierre Peiffer  <pierre.peiffer@bull.net>
+
+       * buildok/twenty.stp, semok/seventeen.stp: Adapt to kernel 2.6.20.
+
 2007-03-19  David Smith  <dsmith@redhat.com>
 
        * .cvsignore: Added systemtap.syscall test programs.

diff --git a/testsuite/buildok/twenty.stp b/testsuite/buildok/twenty.stp
index aa6287c4848dd93a17fa99bad0ac452d12145ddf..e7db822754e3f53417dd692cda50d445ded0cea8 100755 (executable)
--- a/testsuite/buildok/twenty.stp
+++ b/testsuite/buildok/twenty.stp
@@ -4,5 +4,9 @@
 
 probe kernel.function("vfs_readdir")
 {
+%( kernel_v >= "2.6.20" %?
+       $file->f_path->dentry->d_name->len = 1
+%:
        $file->f_dentry->d_name->len = 1
+%)
 }

diff --git a/testsuite/semok/seventeen.stp b/testsuite/semok/seventeen.stp
index dcb269525ad448b846e921a88341bca34f64bad5..cd058de6db59946363784aeaf6310c5a5e9eb23b 100755 (executable)
--- a/testsuite/semok/seventeen.stp
+++ b/testsuite/semok/seventeen.stp
@@ -1,7 +1,8 @@
 #! stap -p2
 
 global foo
-probe kernel.function("pipe_writev")
+probe kernel.function(
+%( kernel_v < "2.6.19" %? "pipe_writev" %: "pipe_write" %) )
 {
    a = $nr_segs
    foo [a] = 1