Merge branch 'master' of git://sources.redhat.com/git/systemtap

15 files changed, 98 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index bc759185..0cd3c197 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-04  David Smith  <dsmith@redhat.com>
+
+	* buildrun.cxx (compile_pass): Tweaked build system for the
+	2.6.23-rc8-mm2 kernel.
+
 2007-10-03  Frank Ch. Eigler  <fche@elastic.org>
 
 	PR 5102
diff --git a/buildrun.cxx b/buildrun.cxx
index 830255d6..709a6e5e 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -42,7 +42,7 @@ compile_pass (systemtap_session& s)
 
   // Clever hacks copied from vmware modules
   o << "stap_check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo \"$(1)\"; else echo \"$(2)\"; fi)" << endl;
-  o << "stap_check_build = $(shell " << "set -x; " << " if $(CC) $(CPPFLAGS) $(CFLAGS_KERNEL) $(EXTRA_CFLAGS) $(CFLAGS) -DKBUILD_BASENAME=\\\"" << s.module_name << "\\\" -Werror -S -o /dev/null -xc $(1) > /dev/null ; then echo \"$(2)\"; else echo \"$(3)\"; fi)" << endl;
+  o << "stap_check_build = $(shell " << "set -x; " << " if $(CC) $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(KBUILD_CFLAGS) $(CFLAGS_KERNEL) $(EXTRA_CFLAGS) $(CFLAGS) -DKBUILD_BASENAME=\\\"" << s.module_name << "\\\" -Werror -S -o /dev/null -xc $(1) > /dev/null ; then echo \"$(2)\"; else echo \"$(3)\"; fi)" << endl;
 
 
   o << "SYSTEMTAP_RUNTIME = \"" << s.runtime_path << "\"" << endl;
@@ -59,10 +59,10 @@ compile_pass (systemtap_session& s)
   o << module_cflags << " += $(call stap_check_build, $(SYSTEMTAP_RUNTIME)/autoconf-ktime-get-real.c, -DSTAPCONF_KTIME_GET_REAL,)" << endl;
 
   for (unsigned i=0; i<s.macros.size(); i++)
-    o << "CFLAGS += -D " << lex_cast_qstring(s.macros[i]) << endl;
+    o << "EXTRA_CFLAGS += -D " << lex_cast_qstring(s.macros[i]) << endl;
 
   if (s.verbose > 2)
-    o << "CFLAGS += -ftime-report -Q" << endl;
+    o << "EXTRA_CFLAGS += -ftime-report -Q" << endl;
 
   // XXX: unfortunately, -save-temps can't work since linux kbuild cwd
   // is not writeable.
@@ -70,13 +70,13 @@ compile_pass (systemtap_session& s)
   // if (s.keep_tmpdir)
   // o << "CFLAGS += -fverbose-asm -save-temps" << endl;
 
-  o << "CFLAGS += -freorder-blocks" << endl; // improve on -Os
+  o << "EXTRA_CFLAGS += -freorder-blocks" << endl; // improve on -Os
 
   // o << "CFLAGS += -fno-unit-at-a-time" << endl;
     
   // Assumes linux 2.6 kbuild
-  o << "CFLAGS += -Wno-unused -Werror" << endl;
-  o << "CFLAGS += -I\"" << s.runtime_path << "\"" << endl;
+  o << "EXTRA_CFLAGS += -Wno-unused -Werror" << endl;
+  o << "EXTRA_CFLAGS += -I\"" << s.runtime_path << "\"" << endl;
   // XXX: this may help ppc toc overflow
   // o << "CFLAGS := $(subst -Os,-O2,$(CFLAGS)) -fminimal-toc" << endl;
   o << "obj-m := " << s.module_name << ".o" << endl;
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index dc638be2..55b0c44a 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,19 @@
+2007-10-04  Mike Mason <mmlnx@us.ibm.com>
+
+	* buildok/memory-all-probes.stp: New test that uses wildcarding to
+	  determine if all probes are resolvable. 
+	* buildok/nfs-all-probes.stp: Ditto
+	* buildok/nfsd-all-probes.stp: Ditto
+	* buildok/process-all-probes.stp: Ditto
+	* buildok/rpc-all-probes.stp: Ditto
+	* buildok/scheduler-all-probes.stp: Ditto
+	* buildok/scsi-all-probes.stp: Ditto
+	* buildok/signal-all-probes.stp: Ditto
+	* buildok/socket-all-probes.stp: Ditto
+	* buildok/tcp-all-probes.stp: Ditto
+	* buildok/udp-all-probes.stp: Ditto
+	* buildok/vfs-all-probes.stp: Ditto
+
 2007-10-03  Frank Ch. Eigler  <fche@elastic.org>
 
 	* systemtap.syscall/test.tcl: Don't list PASS on stdout.
diff --git a/testsuite/buildok/memory-all-probes.stp b/testsuite/buildok/memory-all-probes.stp
new file mode 100755
index 00000000..2b7845bc
--- /dev/null
+++ b/testsuite/buildok/memory-all-probes.stp
@@ -0,0 +1,6 @@
+#! stap -p4
+
+// Tests if all probes in memory.stp are resolvable.
+
+probe vm.*,
+      vm.*.* {}
diff --git a/testsuite/buildok/nfs-all-probes.stp b/testsuite/buildok/nfs-all-probes.stp
new file mode 100755
index 00000000..fb492c8c
--- /dev/null
+++ b/testsuite/buildok/nfs-all-probes.stp
@@ -0,0 +1,5 @@
+#! stap -p4
+
+// Tests if all probes in nfs.stp and nfs_proc.stp are resolvable.
+
+probe nfs.*.*, nfs.*.*.* {}
diff --git a/testsuite/buildok/nfsd-all-probes.stp b/testsuite/buildok/nfsd-all-probes.stp
new file mode 100755
index 00000000..9a290bed
--- /dev/null
+++ b/testsuite/buildok/nfsd-all-probes.stp
@@ -0,0 +1,5 @@
+#! stap -p4
+
+// Tests if all probes in nfsd.stp are resolvable.
+
+probe nfsd.*, nfsd.*.*, nfsd.*.*.* {}
diff --git a/testsuite/buildok/process-all-probes.stp b/testsuite/buildok/process-all-probes.stp
new file mode 100755
index 00000000..ec6ceab0
--- /dev/null
+++ b/testsuite/buildok/process-all-probes.stp
@@ -0,0 +1,5 @@
+#! stap -p4
+
+// Tests if all probes in the process tapset are resolvable.
+
+probe process.* {}
diff --git a/testsuite/buildok/rpc-all-probes.stp b/testsuite/buildok/rpc-all-probes.stp
new file mode 100755
index 00000000..2ecc42c7
--- /dev/null
+++ b/testsuite/buildok/rpc-all-probes.stp
@@ -0,0 +1,5 @@
+#! stap -p4
+
+// Tests if all probes in rpc.stp are resolvable.
+
+probe sunrpc.*, sunrpc.*.*, sunrpc.*.*.* {} 
diff --git a/testsuite/buildok/scheduler-all-probes.stp b/testsuite/buildok/scheduler-all-probes.stp
new file mode 100755
index 00000000..0e06997b
--- /dev/null
+++ b/testsuite/buildok/scheduler-all-probes.stp
@@ -0,0 +1,5 @@
+#! stap -p4
+
+// Tests if all probes in the scheduler tapset are resolvable.
+
+probe scheduler.* {}
diff --git a/testsuite/buildok/scsi-all-probes.stp b/testsuite/buildok/scsi-all-probes.stp
new file mode 100755
index 00000000..d23759c1
--- /dev/null
+++ b/testsuite/buildok/scsi-all-probes.stp
@@ -0,0 +1,5 @@
+#! stap -p4
+
+// Tests if all probes in the scsi tapset are resolvable.
+
+probe scsi.* {}
diff --git a/testsuite/buildok/signal-all-probes.stp b/testsuite/buildok/signal-all-probes.stp
new file mode 100755
index 00000000..6e7a080a
--- /dev/null
+++ b/testsuite/buildok/signal-all-probes.stp
@@ -0,0 +1,9 @@
+#! stap -p4
+
+// Tests if all probes in the signal tapset are resolvable.
+
+probe signal.*,
+      signal.*.*,
+      _signal.*.*,
+      _signal.*.*.* 
+{}
diff --git a/testsuite/buildok/socket-all-probes.stp b/testsuite/buildok/socket-all-probes.stp
new file mode 100755
index 00000000..3fe9d488
--- /dev/null
+++ b/testsuite/buildok/socket-all-probes.stp
@@ -0,0 +1,6 @@
+#! stap -p4
+
+// Tests if all probes in the socket tapset are resolvable.
+
+probe socket.*, 
+      socket.*.* {}
diff --git a/testsuite/buildok/tcp-all-probes.stp b/testsuite/buildok/tcp-all-probes.stp
new file mode 100755
index 00000000..dec6ecf7
--- /dev/null
+++ b/testsuite/buildok/tcp-all-probes.stp
@@ -0,0 +1,6 @@
+#! stap -p4
+
+// Tests if all probes in the tcp tapset are resolvable.
+
+probe tcp.*,
+      tcp.*.* {}
diff --git a/testsuite/buildok/udp-all-probes.stp b/testsuite/buildok/udp-all-probes.stp
new file mode 100755
index 00000000..6e421c7e
--- /dev/null
+++ b/testsuite/buildok/udp-all-probes.stp
@@ -0,0 +1,6 @@
+#! stap -p4
+
+// Tests if all probes in the udp tapset are resolvable.
+
+probe udp.*,
+      udp.*.* {}
diff --git a/testsuite/buildok/vfs-all-probes.stp b/testsuite/buildok/vfs-all-probes.stp
new file mode 100755
index 00000000..d6b6fb0b
--- /dev/null
+++ b/testsuite/buildok/vfs-all-probes.stp
@@ -0,0 +1,8 @@
+#! stap -p4
+
+// Tests if all probes in the vfs.stp are resolvable.
+
+probe vfs.*, 
+      vfs.*.*, 
+      generic.*.*, 
+      generic.*.*.* {}