diff options
| author | David Smith <dsmith@redhat.com> | 2010-04-06 13:17:15 -0500 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2010-04-06 13:17:15 -0500 |
| commit | 602eddb22e42fd0ae51549240f54a247d13afe17 (patch) | |
| tree | 28470660f76d1df1b62ce82e7063e056ba95ed5a /testsuite/lib | |
| parent | dd3d6ed1d4187da281fac6c344ebe765274325bc (diff) | |
| download | systemtap-steved-602eddb22e42fd0ae51549240f54a247d13afe17.tar.gz systemtap-steved-602eddb22e42fd0ae51549240f54a247d13afe17.tar.xz systemtap-steved-602eddb22e42fd0ae51549240f54a247d13afe17.zip | |
Added atomic_read() embedded-C function and tests.
* tapset/atomic.stp: Added atomic_read().
* testsuite/buildok/atomic.stp: Added atomic_read() compile test.
* testsuite/systemtap.base/atomic.exp: Added atomic_read() tests.
* testsuite/lib/stap_run_error.exp (stap_run_error): Logs stap command and
tries to ensure inferior process is killed.
Diffstat (limited to 'testsuite/lib')
| -rw-r--r-- | testsuite/lib/stap_run_error.exp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/testsuite/lib/stap_run_error.exp b/testsuite/lib/stap_run_error.exp index 84068265..ba199b17 100644 --- a/testsuite/lib/stap_run_error.exp +++ b/testsuite/lib/stap_run_error.exp @@ -7,6 +7,7 @@ proc stap_run_error { TEST_NAME EXPECT_ERROR ERROR_STRING OUTPUT_CHECK_STRING args } { set full_error "ERROR: $ERROR_STRING\r\n" set cmd [concat {stap -v} $args] + send_log "executing: $cmd\n" eval spawn $cmd expect { -timeout 150 @@ -35,7 +36,7 @@ proc stap_run_error { TEST_NAME EXPECT_ERROR ERROR_STRING OUTPUT_CHECK_STRING ar set output "^systemtap ending probe\r\n$OUTPUT_CHECK_STRING" expect { - -timeout 10 + -timeout 20 -re $output { if {$EXPECT_ERROR} { fail "$TEST_NAME didn't receive expected error" @@ -62,6 +63,8 @@ proc stap_run_error { TEST_NAME EXPECT_ERROR ERROR_STRING OUTPUT_CHECK_STRING ar exec kill -INT -[exp_pid] } eof { fail "$TEST_NAME startup (eof)" } } + # again for good measure + exec kill -INT -[exp_pid] catch close wait } |