diff options
| author | Josh Stone <jistone@redhat.com> | 2009-06-02 00:53:40 -0700 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2009-06-02 00:53:40 -0700 |
| commit | f8f0efc149191d8d840adb5908f68c81e652d07b (patch) | |
| tree | 062b1153e3c88f510db650a584fdd17f76dff835 | |
| parent | c8ad068755e7424e767660f2c27cb3b1e2d5343d (diff) | |
| parent | 209dd533fc8de83015d7e83d0426a1cb956ff9fc (diff) | |
| download | systemtap-steved-f8f0efc149191d8d840adb5908f68c81e652d07b.tar.gz systemtap-steved-f8f0efc149191d8d840adb5908f68c81e652d07b.tar.xz systemtap-steved-f8f0efc149191d8d840adb5908f68c81e652d07b.zip | |
Merge branch 'master' of ssh://sourceware.org/git/systemtap
| -rw-r--r-- | dwflpp.cxx | 8 | ||||
| -rw-r--r-- | testsuite/systemtap.base/sdt.exp | 3 |
2 files changed, 9 insertions, 2 deletions
@@ -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} } - |