Merge GDB 7.5.1

gdb/testsuite/gdb.mi/mi-info-os.exp

Index: gdb/testsuite/gdb.mi/mi-info-os.exp
diff --git a/gdb/testsuite/gdb.mi/mi-hack-cli.exp b/gdb/testsuite/gdb.mi/mi-info-os.exp
similarity index 63%
copy from gdb/testsuite/gdb.mi/mi-hack-cli.exp
copy to gdb/testsuite/gdb.mi/mi-info-os.exp
index 6e35f14dc99b2f590183a96a85409d642953a85c..2fff688645ccc62eeb54afa7914605534133bc0b 100644
--- a/gdb/testsuite/gdb.mi/mi-hack-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi-info-os.exp
@@ -1,4 +1,4 @@
-# Copyright 1999, 2001, 2007-2012 Free Software Foundation, Inc.
+# Copyright 2012 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,24 +13,26 @@
 # 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=mi"
 
+# This test is Linux-only.
+if ![istarget *-*-linux*] then {
+    unsupported "mi-info-os.exp"
+    return -1
+}
+
+# Support for XML-output is needed to run this test.
+if [gdb_skip_xml_test] then {
+    unsupported "mi-info-os.exp"
+    return -1
+}
+
 gdb_exit
 if [mi_gdb_start] {
     continue
 }
 
-mi_gdb_test "show architecture" \
-	"&\"show architecture\\\\n\"\r\n~\"The target architecture.*\"\r\n\\^done" \
-	"show architecture"
-
-mi_gdb_test "47show architecture" \
-	"&\"show architecture\\\\n\"\r\n~\"The target architecture.*\"\r\n47\\^done" \
-	"47show architecture"
+# Try the argument-less form that lists all the types in a table.
 
-mi_gdb_exit
-return 0
+mi_gdb_test "-info-os" ".*\\^done,OSDataTable=.*" "-info-os"