From 63a92162205f7c0b6adfef9d91a58806aa33f606 Mon Sep 17 00:00:00 2001
From: David Smith <dsmith@redhat.com>
Date: Mon, 1 Jun 2009 13:25:44 -0500
Subject: Better sdt.exp test cleanup. * testsuite/systemtap.base/sdt.exp:
 Better cleanup.

---
 testsuite/systemtap.base/sdt.exp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testsuite/systemtap.base/sdt.exp b/testsuite/systemtap.base/sdt.exp
index c3aed91e..d24093e0 100644
--- a/testsuite/systemtap.base/sdt.exp
+++ b/testsuite/systemtap.base/sdt.exp
@@ -41,6 +41,7 @@ if {[installtest_p] && [utrace_p]} {
 } else {
   untested "$test $extra_flag"
 }
+catch {exec rm -f $testprog}
 
 # C++
 set testprog "sdt.cxx.exe.$i"
@@ -66,5 +67,5 @@ if {[installtest_p] && [utrace_p]} {
 } else {
   untested "$test c++ $extra_flag"
 }
+catch {exec rm -f $testprog}
 }
-
-- 
cgit 


From 209dd533fc8de83015d7e83d0426a1cb956ff9fc Mon Sep 17 00:00:00 2001
From: William Cohen <wcohen@redhat.com>
Date: Mon, 1 Jun 2009 14:45:22 -0400
Subject: Add debuginfo-install suggestion for kernel probing.

---
 dwflpp.cxx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dwflpp.cxx b/dwflpp.cxx
index d05bdb97..f3429118 100644
--- a/dwflpp.cxx
+++ b/dwflpp.cxx
@@ -299,11 +299,17 @@ dwflpp::setup_kernel(bool debuginfo_needed)
                                              elfutils_kernel_path.c_str(),
                                              &dwfl_report_offline_predicate);
 
-  if (debuginfo_needed)
+  if (debuginfo_needed) {
+    if (rc) {
+      // Suggest a likely kernel dir to find debuginfo rpm for
+      string dir = string("/lib/modules/" + sess.kernel_release );
+      find_debug_rpms(sess, dir.c_str());
+    }
     dwfl_assert (string("missing ") + sess.architecture +
                  string(" kernel/module debuginfo under '") +
                  sess.kernel_build_tree + string("'"),
                  rc);
+  }
 
   // XXX: it would be nice if we could do a single
   // ..._report_offline call for an entire systemtap script, so
-- 
cgit