Reviewed and approved by Daniel Jacobowitz <drow@false.org>

	2006-05-18  Fred Fish  <fnf@specifix.com>
	* gdb.base/a2-run.exp: Allow part of test to run when args aren't
	required.  Check for spurious output after program exits normally.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ff8b5cf684a39be730d31b2355c0c9cd21be1cab..c64f6b5109a3f6ff6e7dfc560a7da1528e6075c9 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-18  Fred Fish  <fnf@specifix.com>
+
+       * gdb.base/a2-run.exp: Allow part of test to run when args aren't
+       required.  Check for spurious output after program exits normally.
+
 2006-05-17  Fred Fish  <fnf@specifix.com>
 
        * gdb.base/relocate.exp: Use gdb_file_cmd rather than

diff --git a/gdb/testsuite/gdb.base/a2-run.exp b/gdb/testsuite/gdb.base/a2-run.exp
index fbc704470cb3820e847d3751630acf47b3290ad6..5a6137d591f3a4f592b45fe5aa5abe40101278f7 100644 (file)
--- a/gdb/testsuite/gdb.base/a2-run.exp
+++ b/gdb/testsuite/gdb.base/a2-run.exp
@@ -20,13 +20,6 @@
 
 # This file was written by Rob Savoye. (rob@cygnus.com)
 
-# These tests don't work for targets can't take arguments...
-
-if [target_info exists noargs] then {
-    verbose "Skipping a2-run.exp because of noargs."
-    return
-}
-
 # Can't do this test without stdio support.
 if [gdb_skip_stdio_test "a2run.exp"] {
     return
@@ -77,11 +70,21 @@ if [istarget "*-*-vxworks*"] then {
     gdb_expect -re "$gdb_prompt $" {}
 } else {
     gdb_expect {
+       -re ".*usage:  factorial <number>.*Program exited with code 01\.\r\n$gdb_prompt $" {
+           pass "run \"$testfile\" with no args"
+           pass "no spurious messages at program exit"
+       }
        -re ".*usage:  factorial <number>.*Program exited with code 01.*$gdb_prompt $" {
            pass "run \"$testfile\" with no args"
+           fail "no spurious messages at program exit"
+       }
+       -re ".*usage:  factorial <number>.* EXIT code 1.*Program exited normally\.\r\n$gdb_prompt $" {
+           pass "run \"$testfile\" with no args (exit wrapper)"
+           pass "no spurious messages at program exit"
        }
        -re ".*usage:  factorial <number>.* EXIT code 1.*Program exited normally.*$gdb_prompt $" {
            pass "run \"$testfile\" with no args (exit wrapper)"
+           fail "no spurious messages at program exit"
        }
        -re ".*$gdb_prompt $" {
            fail "run \"$testfile\" with no args"
@@ -92,6 +95,14 @@ if [istarget "*-*-vxworks*"] then {
        }
     }
 }
+
+# The remaining tests don't work for targets can't take arguments...
+
+if [target_info exists noargs] then {
+    verbose "Skipping rest of a2-run.exp because of noargs."
+    return
+}
+
 # Now run with some arguments
 if [istarget "*-*-vxworks*"] then {
     send_gdb "run vxmain \"5\"\n"