2004-06-04 Michael Chastain <mec.gnu@mindspring.com>

	* gdb.threads/pthreads.exp: Update copyright years.
	(check_control_c): Change asynchronous 'after' to synchronous.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 85dd400..c9f6520 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-04  Michael Chastain  <mec.gnu@mindspring.com>
+
+       * gdb.threads/pthreads.exp: Update copyright years.
+       (check_control_c): Change asynchronous 'after' to synchronous.
+
 2004-06-04  Roland McGrath  <roland@redhat.com>
 
        * gdb.base/auxv.exp (fetch_auxv): Consume output fully through

diff --git a/gdb/testsuite/gdb.threads/pthreads.exp b/gdb/testsuite/gdb.threads/pthreads.exp
index 5dbe1a8..a60a3d3 100644 (file)
--- a/gdb/testsuite/gdb.threads/pthreads.exp
+++ b/gdb/testsuite/gdb.threads/pthreads.exp
@@ -1,4 +1,5 @@
-# Copyright (C) 1996, 1997, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004
+# Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -230,9 +231,9 @@ proc check_control_c {} {
            fail "Continue with all threads running (timeout)"
        }
     }
-    sleep 1
+    after 2000
+    send_gdb "\003"
     set description "Stopped with a ^C"
-    after 1000 [send_gdb "\003"]
     gdb_expect {
        -re "Program received signal SIGINT.*$gdb_prompt $" {
            pass $description