diff options
| author | Daniel Jacobowitz <drow@false.org> | 2010-03-24 21:20:39 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@false.org> | 2010-03-24 21:20:39 +0000 |
| commit | 2390201f4bbde371e4a97f149976d335a1aa909c (patch) | |
| tree | 9f6bace2af68e68438e71f4d5890cf028bd68c79 | |
| parent | 6bf5e0ba81ad745cf18577ae77cd1ff75c92282a (diff) | |
| download | binutils-gdb-2390201f4bbde371e4a97f149976d335a1aa909c.tar.gz | |
* 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".
| -rw-r--r-- | gdb/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/call-signal-resume.exp | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/unwindonsignal.exp | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/watchpoints.c | 3 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 2 |
5 files changed, 19 insertions, 4 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index acd142a78c2..5aa639873e8 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 563f900e39a..bc2b58271c3 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 b753fcf5926..c5597dcd002 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 23d00c02837..0a53c28199a 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 c62f706bfb4..19126a46ef5 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 { |