* 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".

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index acd142a78c233359ee23ab724cc4b15ae90786af..5aa639873e8f51c28f2932fcc8ea4c326361688d 100644 (file)
--- 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 563f900e39afb80e3f8dc0b1a6a8e512840e734c..bc2b58271c3bb5c376e68a9fe5f9183d1b6b9491 100644 (file)
--- 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 b753fcf592649ce82ab6f5ef13a942ded42d6184..c5597dcd002901ff2583f7d27feb7081afd9b37c 100644 (file)
--- 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 23d00c02837dd86ab389514d243a105233bde373..0a53c28199a4a01d12b814c310dcddf7bd7c475e 100644 (file)
--- 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 c62f706bfb46ea61126e0d3da38c3bb87792159d..19126a46ef57c9c149785ba1f5e03e370b65004a 100644 (file)
--- 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 {