Merge GDB 7.5.1

gdb/testsuite/gdb.base/info-proc.exp

Index: gdb/testsuite/gdb.base/info-proc.exp
diff --git a/gdb/testsuite/gdb.base/info-proc.exp b/gdb/testsuite/gdb.base/info-proc.exp
index 4280abd9f23f1ec3bd43d142ab3f489f297e7eb2..1cefb6db90c3b597c7fe70dac5872dc0c45b28cf 100644
--- a/gdb/testsuite/gdb.base/info-proc.exp
+++ b/gdb/testsuite/gdb.base/info-proc.exp
@@ -16,15 +16,6 @@
 # This file was written by Michael Snyder (msnyder@redhat.com)
 # This is a test for the gdb command "info proc"
 
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if { [is_remote target] } then {
-  continue
-}
-
-
 set ws "\[ \t\]+"
 
 set testfile "break"
@@ -54,20 +45,19 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
-# Does this gdb support info proc?
-gdb_test_multiple "help info proc" "help info proc" {
-    -re "Undefined info command: .proc..  Try .help info.*$gdb_prompt $" {
+gdb_test "help info proc" "Show /proc process information about .*"
+
+gdb_test_multiple "info proc" "info proc without a process" {
+    -re "No current process.*$gdb_prompt $" {
+	pass "info proc without a process"
+    }
+    -re "Not supported on this target.*$gdb_prompt $" {
 	# info proc command not supported -- nothing to test here.
 	unsupported "gdb does not support info proc on this target"
 	return -1;
     }
-    -re "Show /proc process information about .*$gdb_prompt $" {
-	pass "help info proc"
-    }
 }
 
-gdb_test "info proc" "No current process.*" "info proc without a process"
-
 if { ! [ runto_main ] } then {
     untested info-proc.exp
     return -1