2006-07-19 Andrew Stubbs <andrew.stubbs@st.com>

	* gdb.base/ifelse.exp: Remove troublesome 'got here' messages.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 0a50407fbf5307f5ad8d70cbe5a98ad44dceb804..a6ba05e1623506acdf6ce53db7b2bfc6665164a2 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-19  Andrew Stubbs  <andrew.stubbs@st.com>
+
+       * gdb.base/ifelse.exp: Remove troublesome 'got here' messages.
+
 2006-07-18  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * gdb.arch/i386-size.c, gdb.arch/i386-size.exp: New files.

diff --git a/gdb/testsuite/gdb.base/ifelse.exp b/gdb/testsuite/gdb.base/ifelse.exp
index fd570a6f55fb41d740f301c563833f9bf1cda81e..1ad6520fb0314e7389d23fca198a2de7ca618fc2 100644 (file)
--- a/gdb/testsuite/gdb.base/ifelse.exp
+++ b/gdb/testsuite/gdb.base/ifelse.exp
@@ -30,8 +30,8 @@ gdb_start
 
 #    with true condition
 set message "if 1 with empty body"
-gdb_test_multiple "if 1\nend\necho got here\\n" $message {
-    -re ".*got here.*$gdb_prompt $" {pass $message}
+gdb_test_multiple "if 1\nend" $message {
+    -re "$gdb_prompt $" {pass $message}
     eof {
        fail "$message (crashed)"
        gdb_exit
@@ -41,8 +41,8 @@ gdb_test_multiple "if 1\nend\necho got here\\n" $message {
 
 #    with false condition
 set message "if 0 with empty body"
-gdb_test_multiple "if 0\nend\necho got here\\n" $message {
-    -re ".*got here.*$gdb_prompt $" {pass $message}
+gdb_test_multiple "if 0\nend" $message {
+    -re "$gdb_prompt $" {pass $message}
     eof {
        fail "$message (crashed)"
        gdb_exit
@@ -62,8 +62,8 @@ gdb_test "if 1\necho true\\n\nelse\necho false\\n\nend" "true" ""
 
 #    with true condition
 set message "if 1 .. else with empty body"
-gdb_test_multiple "if 1\nelse\nend\necho got here\\n" $message {
-    -re ".*got here.*$gdb_prompt $" {pass $message}
+gdb_test_multiple "if 1\nelse\nend" $message {
+    -re "$gdb_prompt $" {pass $message}
     eof {
        fail "$message (crashed)"
        gdb_exit
@@ -76,8 +76,8 @@ gdb_test "if 1\necho true\\n\nelse\necho false\\n\nend" "true" ""
 
 #    with false condition
 set message "if 0 .. else with empty body"
-gdb_test_multiple "if 0\nelse\nend\necho got here\\n" $message {
-    -re ".*got here.*$gdb_prompt $" {pass $message}
+gdb_test_multiple "if 0\nelse\nend" $message {
+    -re "$gdb_prompt $" {pass $message}
     eof {
        fail "$message (crashed)"
        gdb_exit