From: David Smith <dsmith@redhat.com>
Date: Tue, 9 May 2017 21:39:11 +0000 (-0500)
Subject: Add small testsuite fixes for 4.11 kernels.
X-Git-Tag: pre-bpf-merge~69
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=35ea394c93d3;p=systemtap.git

Add small testsuite fixes for 4.11 kernels.

* testsuite/buildok/twentyseven.stp: Avoid missing inlined function
  arguments by probing 'kernel.function("do_execve").call'.
* testsuite/buildok/thirtyone.stp: On 4.11 kernels, handle the vfs_stat()
  function being renamed to vfs_statx().
* testsuite/systemtap.pass1-4/buildok.exp: Add kfails for
  buildok/fortyfour.stp and buildok/map_probe_cond.stp if we don't have
  uprobes.
* testsuite/systemtap.pass1-4/buildok-interactive.exp: Ditto.
---

diff --git a/testsuite/buildok/thirtyone.stp b/testsuite/buildok/thirtyone.stp
index ccba66090..e7e102d89 100755
--- a/testsuite/buildok/thirtyone.stp
+++ b/testsuite/buildok/thirtyone.stp
@@ -1,5 +1,5 @@
 #! stap -wp4
 
-probe kprobe.function("vfs_stat") {}
+probe kprobe.function("vfs_stat")!, kprobe.function("vfs_statx") ? {}
 probe kprobe.function("do_sys_open") {}
 probe kernel.function("filp_close") {}
diff --git a/testsuite/buildok/twentyseven.stp b/testsuite/buildok/twentyseven.stp
index 62900f3b6..a3cbfdee3 100755
--- a/testsuite/buildok/twentyseven.stp
+++ b/testsuite/buildok/twentyseven.stp
@@ -1,6 +1,6 @@
 #! stap -p4
 
-probe kernel.function("do_execve")
+probe kernel.function("do_execve").call
 {
   print(@defined($__argv) ? $__argv[0] : $argv[0])
 }
diff --git a/testsuite/systemtap.pass1-4/buildok-interactive.exp b/testsuite/systemtap.pass1-4/buildok-interactive.exp
index fc4a019c1..d15640fdf 100644
--- a/testsuite/systemtap.pass1-4/buildok-interactive.exp
+++ b/testsuite/systemtap.pass1-4/buildok-interactive.exp
@@ -188,6 +188,9 @@ foreach file [lsort [glob -nocomplain $srcdir/$self/*.stp]] {
 	    # without utrace.
 	    if {$rc == 1 && ![utrace_p]} { setup_kfail UTRACE *-*-*} }
 
+	buildok/fortyfour.stp -
+	buildok/map_probe_cond.stp -
+	buildok/pretty-uprobes.stp -
 	buildok/pretty-uprobes.stp -
 	buildok/ucontext-symbols-embedded.stp -
 	buildok/ucontext-unwind-embedded.stp {
diff --git a/testsuite/systemtap.pass1-4/buildok.exp b/testsuite/systemtap.pass1-4/buildok.exp
index 3926b7f95..79f2217e7 100644
--- a/testsuite/systemtap.pass1-4/buildok.exp
+++ b/testsuite/systemtap.pass1-4/buildok.exp
@@ -40,6 +40,8 @@ foreach file [lsort [glob -nocomplain $srcdir/$self/*.stp]] {
 	    # without utrace.
 	    if {$rc != 0 && ![utrace_p]} { setup_kfail UTRACE *-*-*} }
 
+	buildok/fortyfour.stp -
+	buildok/map_probe_cond.stp -
 	buildok/pretty-uprobes.stp -
 	buildok/ucontext-symbols-embedded.stp -
 	buildok/ucontext-unwind-embedded.stp {