From b32306caf4fa411b12f7d338eadf8779624f6e63 Mon Sep 17 00:00:00 2001
From: Ulrich Weigand <uweigand@de.ibm.com>
Date: Tue, 29 Sep 2009 13:02:58 +0000
Subject: [PATCH] 	* gdb.base/watchpoints.exp: Respect
 gdb,no_hardware_watchpoints 	target_info setting.

	* gdb.threads/thread-specific.exp (get_thread_list): Support targets
	that detect new threads during "info threads".
---
 gdb/testsuite/ChangeLog                       | 8 ++++++++
 gdb/testsuite/gdb.base/watchpoints.exp        | 5 +++++
 gdb/testsuite/gdb.threads/thread-specific.exp | 3 +++
 3 files changed, 16 insertions(+)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 407832e808..e83c0fc9eb 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2009-09-29  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
+
+	* gdb.base/watchpoints.exp: Respect gdb,no_hardware_watchpoints
+	target_info setting.
+
+	* gdb.threads/thread-specific.exp (get_thread_list): Support targets
+	that detect new threads during "info threads".
+
 2009-09-27  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
 	* gdb.threads/manythreads.c (main): Increase thread stack size
diff --git a/gdb/testsuite/gdb.base/watchpoints.exp b/gdb/testsuite/gdb.base/watchpoints.exp
index 7abe14bb87..616de139d9 100644
--- a/gdb/testsuite/gdb.base/watchpoints.exp
+++ b/gdb/testsuite/gdb.base/watchpoints.exp
@@ -45,6 +45,11 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load $binfile
 
+    # Disable hardware watchpoints if necessary.
+    if [target_info exists gdb,no_hardware_watchpoints] {
+        gdb_test "set can-use-hw-watchpoints 0" "" ""
+    }
+
     runto_main
     gdb_test "watch ival1" "" ""
     gdb_test "watch ival3" "" ""
diff --git a/gdb/testsuite/gdb.threads/thread-specific.exp b/gdb/testsuite/gdb.threads/thread-specific.exp
index 775940b73e..30e1a43ae2 100644
--- a/gdb/testsuite/gdb.threads/thread-specific.exp
+++ b/gdb/testsuite/gdb.threads/thread-specific.exp
@@ -43,6 +43,9 @@ proc get_thread_list { } {
     -re "info threads\r\n" {
       exp_continue
     }
+    -re "New Thread \[^\n\]*\n" {
+      exp_continue
+    }
     -re "^\\*  *(\[0-9\]*) Thread \[^\n\]*main\[^\n\]*\n" {
       set thr_list "$expect_out(1,string) $thr_list"
       exp_continue