Get more passes in semok.exp and semko.exp on ppc64.

* dwflpp.cxx (build_kernel_blacklist): Add ppc64-specific
  include/asm/io-defs.h file to the blacklist.
* testsuite/systemtap.pass1-4/semko.exp: Make sure vfs_read() doesn't have
  an inlined version before running twentytwo.stp.
* testsuite/systemtap.pass1-4/semok.exp (dyninst_kfails): Check for plt
  probe support before running plt[12].stp.

diff --git a/dwflpp.cxx b/dwflpp.cxx
index eed3a7c867d3270c44417c7c880b29be1687e3b5..eb162bf78ede1d15c275c1d29f64a565873ba148 100644 (file)
--- a/dwflpp.cxx
+++ b/dwflpp.cxx
@@ -4241,6 +4241,7 @@ dwflpp::build_kernel_blacklist()
   blfile += "kernel/kprobes\\.c"; // first alternative, no "|"
   blfile += "|arch/.*/kernel/kprobes\\.c";
   blfile += "|.*/include/asm/io\\.h";
+  blfile += "|.*/include/asm/io-defs\\.h";
   blfile += "|.*/include/asm/io_64\\.h";
   blfile += "|.*/include/asm/bitops\\.h";
   blfile += "|drivers/ide/ide-iops\\.c";

diff --git a/testsuite/systemtap.pass1-4/semko.exp b/testsuite/systemtap.pass1-4/semko.exp
index 7db4a6223e2ec8795456649174101362c849554c..0b8dffa2f412e7cd183e47f7e4a341a1a7c45c72 100644 (file)
--- a/testsuite/systemtap.pass1-4/semko.exp
+++ b/testsuite/systemtap.pass1-4/semko.exp
@@ -20,6 +20,13 @@ foreach runtime [get_runtime_list] {
                semko/utrace.stp {
                    # These tests require a system without utrace.
                    if {[utrace_p]} { untested $test; continue } }
+               semko/twentytwo.stp {
+                   # This test requires a kernel where an inlined
+                   # version of vfs_read() doesn't exist. One does
+                   # exist on 3.10.0-327.el7.ppc64.
+                   set pp "kernel.function(\"vfs_read\").inline"
+                   if {![catch {exec stap -l ${pp} 2>&1} dummy]} {
+                       untested $test; continue } }
            }
            
            verbose -log "Running $file"

diff --git a/testsuite/systemtap.pass1-4/semok.exp b/testsuite/systemtap.pass1-4/semok.exp
index bd00a151180861a49a59b8fd911f7bfeeff152b1..70b40530295c39b47704be3b651d3ab51bb471b6 100644 (file)
--- a/testsuite/systemtap.pass1-4/semok.exp
+++ b/testsuite/systemtap.pass1-4/semok.exp
@@ -1,6 +1,7 @@
 set self semok
 
 proc dyninst_kfails {test} {
+    global plt_probes_p
     # Use setup_kfail <pr number> <target triplet> for known bugs.
     #
     # (Note that tcl doesn't like comments directly inside the switch
@@ -68,6 +69,14 @@ proc dyninst_kfails {test} {
            # that use utrace-like probes)
            setup_kfail 14708 *-*-*
        }
+
+       semok/plt1.stp -
+       semok/plt2.stp {
+           # Note that this isn't quite right. plt_probes_p really
+           # checks for kenel-runtime plt probe support, but it is
+           # close enough for our purposes.
+           if {!$plt_probes_p} { setup_kfail PLT *-*-* }
+       }
     }
 }