Merge GDB 7.5.1

gdb/testsuite/gdb.mi/mi2-prompt.exp

Index: gdb/testsuite/gdb.mi/mi2-prompt.exp
diff --git a/gdb/testsuite/gdb.mi/mi2-hack-cli.exp b/gdb/testsuite/gdb.mi/mi2-prompt.exp
similarity index 60%
copy from gdb/testsuite/gdb.mi/mi2-hack-cli.exp
copy to gdb/testsuite/gdb.mi/mi2-prompt.exp
index fb1e4d7d002bee3952cb509aecc5a58a91e9aa76..6145c38fc1b62dca55543701f9d08bb4e98d3739 100644
--- a/gdb/testsuite/gdb.mi/mi2-hack-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi2-prompt.exp
@@ -1,4 +1,4 @@
-# Copyright 1999, 2001, 2003, 2007-2012 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -13,9 +13,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
-# Some basic checks for the CLI.
-
 load_lib mi-support.exp
 set MIFLAGS "-i=mi2"
 
@@ -24,13 +21,18 @@ if [mi_gdb_start] {
     continue
 }
 
-mi_gdb_test "show architecture" \
-	"&\"show architecture\\\\n\"\r\n~\"The target architecture.*\"\r\n\\^done" \
-	"show architecture"
+# Check console 'set prompt' does not affect the MI output.
+
+mi_gdb_test {-interpreter-exec console "set prompt (banana) "} {\^done} \
+	    "console set prompt"
+mi_gdb_test "-break-list" ".*}" "-break-list"
+
+gdb_exit
+gdb_start
+
+# Check 'set prompt' affects console output even for "interpreter-exec mi".
 
-mi_gdb_test "47show architecture" \
-	"&\"show architecture\\\\n\"\r\n~\"The target architecture.*\"\r\n47\\^done" \
-	"47show architecture"
+set gdb_prompt {\(banana\)}
+gdb_test_no_output "set prompt (banana) "
 
-mi_gdb_exit
-return 0
+gdb_test "interpreter-exec mi -break-list" "\r\n\\^done,.*}"