OBS User unknown 2009-02-03 23:39:48 +00:00 committed by Git OBS Bridge
parent 8575ab72e5
commit 020294aa90
3 changed files with 52 additions and 1 deletions

View File

@ -0,0 +1,42 @@
---
testsuite/systemtap.base/debugpath.exp | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
Index: b/testsuite/systemtap.base/debugpath.exp
===================================================================
--- a/testsuite/systemtap.base/debugpath.exp
+++ b/testsuite/systemtap.base/debugpath.exp
@@ -11,11 +11,27 @@ wait
set test "debugpath-good"
set uname [exec /bin/uname -r]
-spawn env SYSTEMTAP_DEBUGINFO_PATH=/lib/modules/$uname/build stap -e "probe kernel.function(\"sys_open\") {}" -p2
-expect {
- -re {kernel.function.*pc=} { pass $test }
- timeout { fail "$test (timeout2)" }
- eof { fail "$test (eof)" }
+
+# Guess where debuginfo is installed
+if [file isdirectory /usr/lib/debug/boot/] {
+ set debuginfo_path "/usr/lib/debug/boot/"
+} elseif [file isdirectory /usr/lib/debug/lib/modules/$uname] {
+ set debuginfo_path "/usr/lib/debug/lib/modules/$uname"
+} elseif [file isdirectory /lib/modules/$uname/build] {
+ set debuginfo_path "/lib/modules/$uname/build"
+} else {
+ set debuginfo_path "/lib/modules/$uname"
}
-wait
+if { ![file isfile "$debuginfo_path/vmlinux"] && ![file isfile "$debuginfo_path/vmlinux.debug"] } {
+ untested "$test: kernel debuginfo does not exists\n"
+} else {
+ spawn env SYSTEMTAP_DEBUGINFO_PATH=$debuginfo_path stap -e "probe kernel.function(\"sys_open\") {}" -p2
+ expect {
+ -re {kernel.function.*pc=} { pass $test }
+ timeout { fail "$test (timeout2)" }
+ eof { fail "$test (eof)" }
+ }
+
+ wait
+}

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 3 14:39:38 CET 2009 - tiwai@suse.de
- Fix debugpath.exp with $SYSTEMTAP_DEBUGINFO_PATH (bnc#471811)
-------------------------------------------------------------------
Thu Jan 29 12:58:42 CET 2009 - tiwai@suse.de

View File

@ -25,7 +25,7 @@ BuildRequires: latex2html
%define package_version 20080906
License: GPL v2 or later
Version: 0.7.1
Release: 34
Release: 36
Summary: Instrumentation System
Group: Development/Tools/Debuggers
Url: http://sourceware.org/systemtap/
@ -45,6 +45,7 @@ Patch10: systemtap-tcl-send_log-syntax-fix.diff
Patch11: systemtap-tcl-quote-fix.diff
Patch12: stap-fix-procfs-dir_entry-count.diff
Patch13: stap-pr6905-weaken-lineno-checks.diff
Patch14: systemtap-debugpath.exp-path-fix.diff
Requires: libebl1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -78,6 +79,7 @@ Authors:
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%build
autoreconf -fi
@ -106,6 +108,8 @@ rm -rf ${RPM_BUILD_ROOT}
%dir %attr(0755,root,root) /var/cache/systemtap
%changelog
* Tue Feb 03 2009 tiwai@suse.de
- Fix debugpath.exp with $SYSTEMTAP_DEBUGINFO_PATH (bnc#471811)
* Thu Jan 29 2009 tiwai@suse.de
- Fix procfs dir_entry count warning (bnc#470526)
- Improve the parsing of lineno checks (bnc#468247)