From 3eca55e89d6002176819277291508cbb7556c0c9 Mon Sep 17 00:00:00 2001
From: Yao Qi <yao@codesourcery.com>
Date: Wed, 6 Jun 2012 08:47:04 +0000
Subject: [PATCH] gdb/testsuite/

	* gdb.base/info-proc.exp: Return if target doesn't support
	'info proc'.
---
 gdb/testsuite/ChangeLog              |  5 +++++
 gdb/testsuite/gdb.base/info-proc.exp | 23 +++++++++++------------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ad0251c8002..9268014f172 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-06  Yao Qi  <yao@codesourcery.com>
+
+	* gdb.base/info-proc.exp: Return if target doesn't support
+	'info proc'.
+
 2012-06-05  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* gdb.base/freebpcmd.exp (set lines): Check valid range of I.
diff --git a/gdb/testsuite/gdb.base/info-proc.exp b/gdb/testsuite/gdb.base/info-proc.exp
index 14bd1eebf56..1cefb6db90c 100644
--- a/gdb/testsuite/gdb.base/info-proc.exp
+++ b/gdb/testsuite/gdb.base/info-proc.exp
@@ -47,25 +47,24 @@ gdb_load ${binfile}
 
 gdb_test "help info proc" "Show /proc process information about .*"
 
-gdb_test "info proc" "No current process.*" "info proc without a process"
-
-if { ! [ runto_main ] } then {
-    untested info-proc.exp
-    return -1
-}
-
-# Does this gdb support info proc?
-gdb_test_multiple "info proc" "info proc" {
+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 "process ${decimal}.*$gdb_prompt $" {
-	pass "info proc with process"
-    }
 }
 
+if { ! [ runto_main ] } then {
+    untested info-proc.exp
+    return -1
+}
+
+gdb_test "info proc" "process ${decimal}.*" "info proc with process"
+
 gdb_test "info proc mapping" \
 	".*Mapped address spaces:.*${hex}${ws}${hex}${ws}${hex}${ws}${hex}.*" \
 	"info proc mapping"
-- 
2.30.2