diff options
Diffstat (limited to 'testsuite/systemtap.base/static_uprobes.exp')
| -rw-r--r-- | testsuite/systemtap.base/static_uprobes.exp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/testsuite/systemtap.base/static_uprobes.exp b/testsuite/systemtap.base/static_uprobes.exp index 11fec9b1..a4bd5e2c 100644 --- a/testsuite/systemtap.base/static_uprobes.exp +++ b/testsuite/systemtap.base/static_uprobes.exp @@ -14,6 +14,7 @@ puts $fp " void bar (int i) { + STATIC_UPROBES_TEST_PROBE_2(i); if (i == 0) i = 1000; STAP_PROBE1(static_uprobes,test_probe_2,i); @@ -88,6 +89,7 @@ if {[installtest_p]} { if {[catch {exec $dtrace -h -s $sup_dpath} res]} { verbose -log "unable to run $dtrace: $res" } +catch {exec rm -f $sup_dpath} if {[file exists $sup_hpath]} then { pass "$test generating header" } else { @@ -96,8 +98,6 @@ if {[file exists $sup_hpath]} then { return } -catch {exec rm -f $sup_dpath} - if {[installtest_p]} { set sdtdir $env(SYSTEMTAP_INCLUDES) } else { @@ -159,7 +159,7 @@ expect { wait -if {$ok == 4} { pass "$test C" } { fail "$test C ($ok)" } +if {$ok == 5} { pass "$test C" } { fail "$test C ($ok)" } set ok 0 @@ -170,7 +170,6 @@ verbose -log "spawn stap -c $sup_exepath $sup_stppath" spawn stap -c $sup_exepath $sup_stppath expect { -timeout 180 - -re {In test_probe_1 probe} { incr ok; exp_continue } -re {In test_probe_2 probe 0x2} { incr ok; exp_continue } -re {In test_probe_0 probe 0x3} { incr ok; exp_continue } -re {In test_probe_3 probe 0x3 0x[0-9a-f][0-9a-f]} { incr ok; exp_continue } @@ -181,9 +180,9 @@ expect { wait -if {$ok == 4} { pass "$test C++" } { fail "$test C++ ($ok)" } +if {$ok == 5} { pass "$test C++" } { fail "$test C++ ($ok)" } # catch {exec rm -f $sup_srcpath $sup_exepath $supcplus_exepath $sup_hpath $sup_stppath} # It's not so important to clean up, and it's unhelpful if -# one needs to diagnose a test failure.
\ No newline at end of file +# one needs to diagnose a test failure. |