summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dwflpp.cxx8
-rw-r--r--testsuite/systemtap.base/sdt.exp3
2 files changed, 9 insertions, 2 deletions
diff --git a/dwflpp.cxx b/dwflpp.cxx
index 6ca9780d..3af26053 100644
--- a/dwflpp.cxx
+++ b/dwflpp.cxx
@@ -304,11 +304,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
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}
}
-