diff options
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuite/systemtap.base/static_uprobes.exp | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 2a2dcd79..65244185 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,8 +1,11 @@ +2009-02-18 Stan Cox <scox@redhat.com> + + * systemtap.base/static_uprobes.exp: Also test without .probes section. + 2009-02-18 David Smith <dsmith@redhat.com> * systemtap.base/static_uprobes.exp: Handles errors from running 'dtrace' python script better. - * systemtap.base/labels.exp: Better cleanup. 2009-02-17 Frank Ch. Eigler <fche@elastic.org> diff --git a/testsuite/systemtap.base/static_uprobes.exp b/testsuite/systemtap.base/static_uprobes.exp index 64cb6434..d80bd0c4 100644 --- a/testsuite/systemtap.base/static_uprobes.exp +++ b/testsuite/systemtap.base/static_uprobes.exp @@ -4,6 +4,7 @@ set test "sduprobes" # Compile a C program to use as the user-space probing target set sup_srcpath "[pwd]/static_uprobes.c" set sup_exepath "[pwd]/static_uprobes.x" +set supcplus_exepath "[pwd]/static_uprobes_cplus.x" set fp [open $sup_srcpath "w"] puts $fp " #include <stdlib.h> @@ -117,7 +118,7 @@ if { $res != "" } { spawn mv $sup_srcpath "[pwd]/static_uprobes.cc" set sup_srcpath "[pwd]/static_uprobes.cc" set sup_flags "$sup_flags c++" -set res [target_compile $sup_srcpath $sup_exepath executable $sup_flags] +set res [target_compile $sup_srcpath $supcplus_exepath executable $sup_flags] if { $res != "" } { verbose "target_compile failed: $res" 2 fail "compiling $sup_srcpath -g" @@ -162,6 +163,7 @@ if {$ok == 4} { pass "$test" } { fail "$test ($ok)" } set ok 0 +spawn objcopy -R .probes $supcplus_exepath $sup_exepath verbose -log "spawn stap -c $sup_exepath $sup_stppath" spawn stap -c $sup_exepath $sup_stppath expect { @@ -178,4 +180,4 @@ expect { wait if {$ok == 4} { pass "$test" } { fail "$test ($ok)" } -catch {exec rm -f $sup_srcpath $sup_exepath $sup_hpath $sup_stppath} +catch {exec rm -f $sup_srcpath $sup_exepath $supcplus_exepath $sup_hpath $sup_stppath} |