From b5e66adadbad65fddc40a2143e3692e41cf6d1af Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Wed, 3 Dec 2008 13:36:32 -0500 Subject: PR5892: rename new -B /PATH to -r /PATH; merge functionality --- testsuite/ChangeLog | 4 ++++ testsuite/systemtap.base/debugpath.exp | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'testsuite') diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index c1ae1420..1ba4e287 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2008-12-03 Frank Ch. Eigler + + * systemtap.base/debugpath.exp: Correct test case for new -r behavior. + 2008-11-29 Frank Ch. Eigler * systemtap.base/uprobes.exp: Simplify -p5 test. diff --git a/testsuite/systemtap.base/debugpath.exp b/testsuite/systemtap.base/debugpath.exp index bc92c081..b0f938b6 100644 --- a/testsuite/systemtap.base/debugpath.exp +++ b/testsuite/systemtap.base/debugpath.exp @@ -1,6 +1,6 @@ set test "debugpath-bad" -spawn env SYSTEMTAP_DEBUGINFO_PATH=/dev/null stap -e "probe kernel.function(\"sys_open\") {}" -p4 +spawn env SYSTEMTAP_DEBUGINFO_PATH=/dev/null stap -e "probe kernel.function(\"sys_open\") {}" -wp4 expect { -re {^semantic error:.*missing.*debuginfo} { pass $test } timeout { fail "$test (timeout1)" } @@ -13,15 +13,15 @@ set test "debugpath-good" set uname [exec /bin/uname -r] # Guess where debuginfo is installed -if [file isdirectory /usr/lib/debug/lib/modules/$uname] { - set debuginfo_path "/usr/lib/debug/lib/modules/$uname" +if [file isdirectory /usr/lib/debug] { + set debuginfo_path "/usr/lib/debug" } elseif [file isdirectory /lib/modules/$uname/build] { set debuginfo_path "/lib/modules/$uname/build" } else { set debuginfo_path "/lib/modules/$uname" } -spawn env SYSTEMTAP_DEBUGINFO_PATH=$debuginfo_path stap -e "probe kernel.function(\"sys_open\") {}" -p2 +spawn env SYSTEMTAP_DEBUGINFO_PATH=$debuginfo_path stap -e "probe kernel.function(\"sys_open\") {}" -wp2 expect { -re {kernel.function.*pc=} { pass $test } timeout { fail "$test (timeout2)" } -- cgit