gdb/testsuite/

	* gdb.base/info-proc.exp: Return if target doesn't support
	'info proc'.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ad0251c8002585cc5886ab5501a49269f96499a7..9268014f172a9c042a964f15807020ddba3bbbb4 100644 (file)
--- 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 14bd1eebf567173454f979172d7a9f622373862c..1cefb6db90c3b597c7fe70dac5872dc0c45b28cf 100644 (file)
--- 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"