diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-12-03 13:36:32 -0500 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-12-03 13:36:32 -0500 |
| commit | b5e66adadbad65fddc40a2143e3692e41cf6d1af (patch) | |
| tree | c7bd2f51f3940c01ccf9d28ca91d71c7564bc421 /testsuite | |
| parent | a42876234df99f8523ddb2b21025352f37231c39 (diff) | |
| download | systemtap-steved-b5e66adadbad65fddc40a2143e3692e41cf6d1af.tar.gz systemtap-steved-b5e66adadbad65fddc40a2143e3692e41cf6d1af.tar.xz systemtap-steved-b5e66adadbad65fddc40a2143e3692e41cf6d1af.zip | |
PR5892: rename new -B /PATH to -r /PATH; merge functionality
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | testsuite/systemtap.base/debugpath.exp | 8 |
2 files changed, 8 insertions, 4 deletions
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 <fche@elastic.org> + + * systemtap.base/debugpath.exp: Correct test case for new -r behavior. + 2008-11-29 Frank Ch. Eigler <fche@elastic.org> * 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)" } |