From 602eddb22e42fd0ae51549240f54a247d13afe17 Mon Sep 17 00:00:00 2001
From: David Smith <dsmith@redhat.com>
Date: Tue, 6 Apr 2010 13:17:15 -0500
Subject: 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.
---
 testsuite/lib/stap_run_error.exp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'testsuite/lib/stap_run_error.exp')

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
 }
-- 
cgit