diff options
| author | Josh Stone <jistone@redhat.com> | 2009-02-18 13:37:04 -0800 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2009-02-18 13:37:04 -0800 |
| commit | 37d42f2a8792be9c25a71b2ad6b4c55252a1b204 (patch) | |
| tree | d8a75bd67d8b24f77e65d127387ad331ba0fae4f | |
| parent | 23ad66b41ded81502948584816390c634f66c5ee (diff) | |
| parent | 9b9b56ea063b6eea422a6d772bd49469e3eec649 (diff) | |
| download | systemtap-steved-37d42f2a8792be9c25a71b2ad6b4c55252a1b204.tar.gz systemtap-steved-37d42f2a8792be9c25a71b2ad6b4c55252a1b204.tar.xz systemtap-steved-37d42f2a8792be9c25a71b2ad6b4c55252a1b204.zip | |
Merge branch 'master' of sourceware.org:/git/systemtap
| -rw-r--r-- | testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | testsuite/systemtap.base/labels.exp | 9 | ||||
| -rw-r--r-- | testsuite/systemtap.base/static_uprobes.exp | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 1c3693c0..2a2dcd79 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,10 @@ +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> * systemtap.base/static_uprobes.exp: Handle $srcdir != $builddir. diff --git a/testsuite/systemtap.base/labels.exp b/testsuite/systemtap.base/labels.exp index 6c62d576..9c92d69c 100644 --- a/testsuite/systemtap.base/labels.exp +++ b/testsuite/systemtap.base/labels.exp @@ -34,7 +34,8 @@ ptr_inited: " close $fp -set fp [open "[pwd]/labels.stp" "w"] +set label_stppath "[pwd]/labels.stp" +set fp [open $label_stppath "w"] puts $fp " probe process(\"labels.x\").function(\"main*@labels.c\").label(\"init_*\") {printf (\"VARS %s\\n\",\$\$vars)} probe process(\"labels.x\").function(\"main*@labels.c\").label(\"ptr_inited\") {printf (\"VARS %s\\n\",\$\$vars)} @@ -47,13 +48,14 @@ set res [target_compile $label_srcpath $label_exepath executable $label_flags] if { $res != "" } { verbose "target_compile failed: $res" 2 fail "compiling labels.c -g" + catch {exec rm -f $label_srcpath $label_stppath} return } else { pass "compiling labels.c -g" } -verbose -log "spawn stap -c $label_exepath [pwd]/labels.stp" -spawn stap -c $label_exepath [pwd]/labels.stp +verbose -log "spawn stap -c $label_exepath $label_stppath" +spawn stap -c $label_exepath $label_stppath expect { -timeout 180 @@ -65,3 +67,4 @@ expect { wait if {$ok == 1} { pass "$test" } { fail "$test ($ok)" } +catch {exec rm -f $label_srcpath $label_stppath $label_exepath} diff --git a/testsuite/systemtap.base/static_uprobes.exp b/testsuite/systemtap.base/static_uprobes.exp index 6c0f83a8..64cb6434 100644 --- a/testsuite/systemtap.base/static_uprobes.exp +++ b/testsuite/systemtap.base/static_uprobes.exp @@ -84,7 +84,9 @@ if {[installtest_p]} { } else { set dtrace $srcdir/../dtrace } -exec $dtrace -h -s $sup_dpath +if {[catch {exec $dtrace -h -s $sup_dpath} res]} { + verbose -log "unable to run $dtrace: $res" +} if {[file exists $sup_hpath]} then { pass "generating $sup_hpath" } else { |