2001-06-04 Michael Snyder <msnyder@redhat.com>

	* gdb.threads/pthreads.exp (check_control_c): Return 0 for success,
	non-zero if control_c fails.  Terminate the test on failure,
	rather than wait for 12 more tests to time out.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9f539da8029dbaa77816275201d5a703dbafcc2a..a4218085a3131b66644b22e2ef76dcdb98de23af 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-04  Michael Snyder  <msnyder@redhat.com>
+
+       * gdb.threads/pthreads.exp (check_control_c): Return 0 for success,
+       non-zero if control_c fails.  Terminate the test on failure, 
+       rather than wait for 12 more tests to time out.
+
 2001-06-06  Jim Blandy  <jimb@redhat.com>
 
        * gdb.base/exprs.exp ("sizeof (long long) > sizeof (long) (true)"):

diff --git a/gdb/testsuite/gdb.threads/pthreads.exp b/gdb/testsuite/gdb.threads/pthreads.exp
index 00140b6b33602890d8d9e2762c646f3e5cd65513..e57583b475cb52f9bd634901e479a048c6da6c9d 100644 (file)
--- a/gdb/testsuite/gdb.threads/pthreads.exp
+++ b/gdb/testsuite/gdb.threads/pthreads.exp
@@ -259,6 +259,7 @@ proc check_control_c {} {
        }
        timeout {
            fail "$description (timeout)"
+           return 1;
        }
     }
     gdb_test "bt" ""
@@ -267,6 +268,7 @@ proc check_control_c {} {
     if [all_threads_running] then {
        pass "All threads running after continuing from ^C stop"
     }
+    return 0;
 }
 
 proc check_backtraces {} {
@@ -337,7 +339,10 @@ setup_xfail "alpha-*-osf*"
 if [runto_main] then {
     clear_xfail "alpha-*-osf*"
     if [test_startup] then {
-       check_control_c
+       if [check_control_c] then {
+           warning "Could not stop child with ^C; skipping rest of tests.\n"
+           return;
+       }
        check_backtraces
     }
 }