From 6806cc6666ae9469947029f9e78bc84dadef8f71 Mon Sep 17 00:00:00 2001
From: drow <drow>
Date: Thu, 25 Mar 2010 06:20:39 +0000
Subject: [PATCH] 	* gdb.base/call-signal-resume.exp,
 gdb.base/unwindonsignal.exp: Skip 	if gdb,nosignals. 	*
 gdb.base/watchpoints.c: Do not include unnecessary headers. 	* lib/gdb.exp
 (gdb_test_multiple): Relax pattern for "the program 	exited".

---
 gdb/testsuite/ChangeLog                       | 8 ++++++++
 gdb/testsuite/gdb.base/call-signal-resume.exp | 5 +++++
 gdb/testsuite/gdb.base/unwindonsignal.exp     | 5 +++++
 gdb/testsuite/gdb.base/watchpoints.c          | 3 ---
 gdb/testsuite/lib/gdb.exp                     | 2 +-
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index acd142a78c..5aa639873e 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-24  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gdb.base/call-signal-resume.exp, gdb.base/unwindonsignal.exp: Skip
+	if gdb,nosignals.
+	* gdb.base/watchpoints.c: Do not include unnecessary headers.
+	* lib/gdb.exp (gdb_test_multiple): Relax pattern for "the program
+	exited".
+
 2010-03-24  Stan Shebs  <stan@codesourcery.com>
 
 	* gdb.trace/tfile.exp: Expect "trace frame", with a space.
diff --git a/gdb/testsuite/gdb.base/call-signal-resume.exp b/gdb/testsuite/gdb.base/call-signal-resume.exp
index 563f900e39..bc2b58271c 100644
--- a/gdb/testsuite/gdb.base/call-signal-resume.exp
+++ b/gdb/testsuite/gdb.base/call-signal-resume.exp
@@ -29,6 +29,11 @@ if [target_info exists gdb,noinferiorio] {
     continue
 }
 
+if [target_info exists gdb,nosignals] {
+    verbose "Skipping call-signal-resume.exp because of nosignals."
+    continue
+}
+
 set prms_id 0
 set bug_id 0
 
diff --git a/gdb/testsuite/gdb.base/unwindonsignal.exp b/gdb/testsuite/gdb.base/unwindonsignal.exp
index b753fcf592..c5597dcd00 100644
--- a/gdb/testsuite/gdb.base/unwindonsignal.exp
+++ b/gdb/testsuite/gdb.base/unwindonsignal.exp
@@ -22,6 +22,11 @@ if [target_info exists gdb,noinferiorio] {
     continue
 }
 
+if [target_info exists gdb,nosignals] {
+    verbose "Skipping unwindonsignal.exp because of nosignals."
+    continue
+}
+
 set prms_id 0
 set bug_id 0
 
diff --git a/gdb/testsuite/gdb.base/watchpoints.c b/gdb/testsuite/gdb.base/watchpoints.c
index 23d00c0283..0a53c28199 100644
--- a/gdb/testsuite/gdb.base/watchpoints.c
+++ b/gdb/testsuite/gdb.base/watchpoints.c
@@ -21,9 +21,6 @@
 /* This source is mainly to test what happens when a watchpoint is
    removed while another watchpoint, inserted later is left active.  */
 
-#include <stdio.h>
-#include <unistd.h>
-
 int count = -1;
 int ival1 = -1;
 int ival2 = -1;
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index c62f706bfb..19126a46ef 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -747,7 +747,7 @@ proc gdb_test_multiple { command message user_code } {
 	    fail "$errmsg"
 	    set result -1
 	}
-	 -re "EXIT code \[0-9\r\n\]+Program exited normally.*$gdb_prompt $" {
+	 -re "Program exited normally.*$gdb_prompt $" {
 	    if ![string match "" $message] then {
 		set errmsg "$message (the program exited)"
 	    } else {
-- 
2.11.0