summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--testsuite/ChangeLog5
-rwxr-xr-xtestsuite/buildok/eighteen.stp7
-rwxr-xr-xtestsuite/buildok/two.stp4
3 files changed, 16 insertions, 0 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index d77fee48..47ac93fe 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-28 Martin Hunt <hunt@redhat.com>
+
+ * buildok/eighteen.stp: Fix for 2.6.18.
+ * buildok/two.stp: Ditto.
+
2006-09-27 Josh Stone <joshua.i.stone@intel.com>
* buildok/fourteen.stp: Test new timer functionality.
diff --git a/testsuite/buildok/eighteen.stp b/testsuite/buildok/eighteen.stp
index 5ec6debc..e7e88ec7 100755
--- a/testsuite/buildok/eighteen.stp
+++ b/testsuite/buildok/eighteen.stp
@@ -5,7 +5,14 @@
# provided by searching the function's DIE rather than the by PC
# proximity. (PR 1244)
+%( kernel_v >= "2.6.18" %?
+probe kernel.function("__audit_getname@kernel/auditsc.c")
+{
+ log(kernel_string($name));
+}
+%:
probe kernel.function("audit_getname@kernel/auditsc.c")
{
log(kernel_string($name));
}
+%)
diff --git a/testsuite/buildok/two.stp b/testsuite/buildok/two.stp
index e10a036d..f3b89616 100755
--- a/testsuite/buildok/two.stp
+++ b/testsuite/buildok/two.stp
@@ -3,7 +3,11 @@
./stap -p4 -g $@ - <<'END'
%{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
#include <linux/version.h>
+#else
+#include <linux/utsrelease.h>
+#endif
%}
function get_release () %{