GDB 7.6.50

gdb/testsuite/gdb.mi/mi-console.exp

Index: gdb/testsuite/gdb.mi/mi-console.exp
diff --git a/gdb/testsuite/gdb.mi/mi-console.exp b/gdb/testsuite/gdb.mi/mi-console.exp
index 891c7437e3d2e0deeea057c1362fea2c685994c4..47b0677278ec3dbe0536767c05f4568ed1aa679f 100644
--- a/gdb/testsuite/gdb.mi/mi-console.exp
+++ b/gdb/testsuite/gdb.mi/mi-console.exp
@@ -1,4 +1,4 @@
-# Copyright 1999-2003, 2005, 2007-2012 Free Software Foundation, Inc.
+# Copyright 1999-2013 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,23 +13,38 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# Test inferior console output, with MI.
+
+load_lib mi-support.exp
+set MIFLAGS "-i=mi"
+
 #
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can run a simple program and perform basic
-# debugging activities like: insert breakpoints, run the program,
-# step, next, continue until it ends and, last but not least, quit.
-#
-# The goal is not to test gdb functionality, which is done by other tests,
-# but to verify the correct output response to MI operations.
+# Given STRING, return the semihosted version of that string.
 #
+proc semihosted_string { string } {
+    set semihosted_list {}
+    set leading_markers "@\""
+    set trailing_markers "\"\r\n"
 
-# This test only works when talking to a target that routes its output
-# through GDB.  Check that we're either talking to a simulator or a
-# remote target.
+    if {$string != "" } {
+	set split_string [split $string ""]
 
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
+	foreach char $split_string {
+	    # Escape special characters.
+	    if {$char == "\\"} {
+		set char "\\\\\\\\"
+	    } elseif {$char == "\r"} {
+		  set char "\\\\r"
+	    } elseif {$char == "\n"} {
+		  set char "\\\\n"
+	    } elseif {$char == "\""} {
+		  set char "\\\\\""
+	    }
+	    lappend semihosted_list $leading_markers $char $trailing_markers
+	}
+    }
+  return [join $semihosted_list ""]
+}
 
 gdb_exit
 if [mi_gdb_start separate-inferior-tty] {
@@ -45,11 +60,34 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 
 mi_run_to_main
 
+# The output we get from the target depends on how it is hosted.  If
+# we are semihosted (e.g., the sim or a remote target that supports
+# the File I/O remote protocol extension), we see the target I/O
+# encapsulated in MI target output stream records.  If debugging with
+# a native target, the inferior's I/O streams are connected directly
+# to a PTY we create for the inferior (notice separate-inferior-tty
+# above), and we just see the program's output unadorned.  If
+# debugging with a remote target that doesn't support semihosting,
+# we'll see nothing.
+
+# The program's real output string.
+set program_output "Hello \\\"!\r\n"
+
+# Prepare the pattern for the PTY output of a native target.
+set native_output [string map {"\r\n" "\[\r\n\]+"} $program_output]
+set native_output [string map {"\\" "\\\\"} $native_output]
+
+# Prepare the pattern for the semihosted output.
+set semihosted_output [semihosted_string $program_output]
+
+# Combine both outputs in a single pattern.
+set output "($semihosted_output|$native_output)"
+
 # Next over the hello() call which will produce lots of output
 mi_gdb_test "220-exec-next" \
 	    "220\\^running(\r\n\\*running,thread-id=\"all\")?" \
 	    "Testing console output" \
-	    "Hello \\\\\"!\[\r\n\]+"
+	    $output
 
 mi_expect_stop "end-stepping-range" "main" "" ".*mi-console.c" "14" "" \
     "finished step over hello"