diff options
| -rw-r--r-- | testsuite/systemtap.examples/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuite/systemtap.examples/check.exp | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/testsuite/systemtap.examples/ChangeLog b/testsuite/systemtap.examples/ChangeLog index c50bcefc..682e44e5 100644 --- a/testsuite/systemtap.examples/ChangeLog +++ b/testsuite/systemtap.examples/ChangeLog @@ -1,5 +1,10 @@ 2008-08-11 Mark Wielaard <mwielaard@redhat.com> + * check.exp: Make sure that stderr gets redircted so warnings don't + make example script run fail. + +2008-08-11 Mark Wielaard <mwielaard@redhat.com> + PR6835. Reported by Eugeniy Meshcheryakov <eugen@debian.org> * io/io_submit.stp: Fix #! start. Convert to normal line-ending. diff --git a/testsuite/systemtap.examples/check.exp b/testsuite/systemtap.examples/check.exp index 14d9a57e..482738cc 100644 --- a/testsuite/systemtap.examples/check.exp +++ b/testsuite/systemtap.examples/check.exp @@ -36,7 +36,10 @@ proc run_command { test command } { #FIXME tcl says that single quotes not dealt with if { $command != "" } then { verbose -log "attempting command $command" - set res [catch {eval exec $command} value] + # Pipe both stdout and stderr to cat, otherwise any stderr + # output results in res being set to 1 (TCL_ERROR). This breaks + # scripts that have WARNINGS about for example skipped probes. + set res [catch {eval exec "$command |& cat"} value] verbose -log "OUT $value" verbose -log "RC $res" if {$res != 0 } { |