Small changes to several buildok testcases.

* testsuite/buildok/logging-embedded.stp: Renamed from logging.stp.
* testsuite/buildok/nfs_proc-embedded.stp: Added the rest of the
  nfs_proc.stp embedded functions to the test.
* testsuite/buildok/memory-embedded.stp: Added GFP_KERNEL test.
* testsuite/buildok/irq-all-probes.stp: Added '-w' to avoid empty probe
  warnings.
* testsuite/buildok/utrace.stp: Ditto.

diff --git a/testsuite/buildok/irq-all-probes.stp b/testsuite/buildok/irq-all-probes.stp
index 7f1c2ab66a0b9bc0556d7255b66802a3ebbe1c4b..5cd3dc99c96dbd0f74e8b4f642abb1ad04390409 100755 (executable)
--- a/testsuite/buildok/irq-all-probes.stp
+++ b/testsuite/buildok/irq-all-probes.stp
@@ -1,4 +1,4 @@
-#! stap -p4
+#! stap -wp4
 
 // Tests if all probes in irq tapset are resolvable
 

diff --git a/testsuite/buildok/logging.stp b/testsuite/buildok/logging-embedded.stp
similarity index 81%
rename from testsuite/buildok/logging.stp
rename to testsuite/buildok/logging-embedded.stp
index 636770c709eb6a28d02764e5cd8c5d024a2ee02e..4d6c5410c842a134f007be48d65ef497be59eaf8 100755 (executable)
--- a/testsuite/buildok/logging.stp
+++ b/testsuite/buildok/logging-embedded.stp
@@ -3,9 +3,10 @@
 // build-test the logging tapset functions
 
 probe begin {
-      ftrace("ftrace")
       log("log")
       warn("warn")
       exit()
       error("error")
+      stp_print_binary(1, 0, 0, 0, 0)
+      ftrace("ftrace")
 }

diff --git a/testsuite/buildok/memory-embedded.stp b/testsuite/buildok/memory-embedded.stp
index 62f2ca45dc3a061bc1fdf2538b8c368964a97487..79488aa10249c26607952186a507eab0ecb17d62 100755 (executable)
--- a/testsuite/buildok/memory-embedded.stp
+++ b/testsuite/buildok/memory-embedded.stp
@@ -3,6 +3,7 @@
 probe begin
 {
        printf("%d\n", vm_fault_contains(0, 0)
-               + addr_to_node(0) + _IS_ZERO_PAGE(0, 0))
+               + addr_to_node(0) + _IS_ZERO_PAGE(0, 0)
+               + GFP_KERNEL())
        printf("%s\n", __gfp_flag_str(0))
 }

diff --git a/testsuite/buildok/nfs_proc-embedded.stp b/testsuite/buildok/nfs_proc-embedded.stp
index ad46085eb337566ef788f35da7a745e449bdcb45..d312e1b0bc29df7f36c3fa876fc3736ecc4aaf75 100755 (executable)
--- a/testsuite/buildok/nfs_proc-embedded.stp
+++ b/testsuite/buildok/nfs_proc-embedded.stp
@@ -1,7 +1,17 @@
 #! stap -p4
 
 probe begin {
-       print (__i2n_ip_proto (0,0) +
+       print (AF_INET() +
+              NFS_I(0) +
+              NFS_FH(0) +
+              NFS_SERVER(0) +
+              NFS_CLIENT(0) +
+              NFS_PROTO(0) +
+              get_ip_from_client(0) +
+              get_prot_from_client(0) +
+              get_ip(0) +
+              get_prot(0) +
+              __i2n_ip_proto (0,0) +
               __nfs_read_data_info (0,0) +
               __nfs_write_data_info (0,0) +
               __nfsv4_bitmask (0,0) +

diff --git a/testsuite/buildok/utrace.stp b/testsuite/buildok/utrace.stp
index 436bf9c446120a4f0a6779941fb1429d1bedc705..7379c7c2f9b2cf5291f073e486bec404979d8b8f 100755 (executable)
--- a/testsuite/buildok/utrace.stp
+++ b/testsuite/buildok/utrace.stp
@@ -1,3 +1,3 @@
-#! stap -p4
+#! stap -wp4
 
 probe   %( CONFIG_UTRACE == "y" %? process.begin %: never %)    { }