From 020294aa90309e3a9ef8ef7c49ddc4ce91bb22ca8b67e7367f01a672b9d9be6d Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 3 Feb 2009 23:39:48 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemtap?expand=0&rev=37 --- systemtap-debugpath.exp-path-fix.diff | 42 +++++++++++++++++++++++++++ systemtap.changes | 5 ++++ systemtap.spec | 6 +++- 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 systemtap-debugpath.exp-path-fix.diff diff --git a/systemtap-debugpath.exp-path-fix.diff b/systemtap-debugpath.exp-path-fix.diff new file mode 100644 index 0000000..d757848 --- /dev/null +++ b/systemtap-debugpath.exp-path-fix.diff @@ -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 ++} diff --git a/systemtap.changes b/systemtap.changes index 9c78b71..12bf5e4 100644 --- a/systemtap.changes +++ b/systemtap.changes @@ -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 diff --git a/systemtap.spec b/systemtap.spec index d54896b..448bc40 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -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)