Clarify "list" output when specified lines are ambiguous

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / float.exp

diff --git a/gdb/testsuite/gdb.base/float.exp b/gdb/testsuite/gdb.base/float.exp
index 448102bde82a96b25d1da8a90eaffcdb9f7c3f40..e09c124b8825d687cd0bac9f363b0b61b0ed9230 100644 (file)
--- a/gdb/testsuite/gdb.base/float.exp
+++ b/gdb/testsuite/gdb.base/float.exp
@@ -1,4 +1,4 @@
-# Copyright 2003, 2007-2012 Free Software Foundation, Inc.
+# Copyright 2003-2017 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
@@ -23,7 +23,7 @@
 #
 
 
-if { [prepare_for_testing float.exp float float.c] } {
+if { [prepare_for_testing "failed to prepare" float float.c] } {
     return -1
 }
 
@@ -36,9 +36,11 @@ if ![runto_main] then {
 
 # Test "info float".
 
-if { [istarget "alpha*-*-*"] } then {
+if { [is_aarch64_target] } then {
+    gdb_test "info float" "d0.*d1.*d31.*s0.*s1.*s31.*" "info float"
+} elseif { [istarget "alpha*-*-*"] } then {
     gdb_test "info float" "f0.*" "info float"
-} elseif { [istarget "arm*-*-*"] } then {
+} elseif { [is_aarch32_target] } then {
     gdb_test_multiple "info float" "info float" {
        -re "Software FPU type.*mask:.*flags:.*$gdb_prompt $" {
            pass "info float (FPA)"
@@ -48,7 +50,7 @@ if { [istarget "alpha*-*-*"] } then {
            # if we have NEON.
            pass "info float (VFP)"
        }
-        -re "No floating.point info available for this processor.*" {
+        -re "No floating.point info available for this processor.*$gdb_prompt $" {
             pass "info float (without FPU)"
        }
     }
@@ -61,18 +63,34 @@ if { [istarget "alpha*-*-*"] } then {
         -re "fp0.*fp1.*fp7.*$gdb_prompt $" {
             pass "info float (with FPU)"
        }
-        -re "No floating.point info available for this processor.*" {
+        -re "No floating.point info available for this processor.*$gdb_prompt $" {
             pass "info float (without FPU)"
        }
     }
 } elseif [istarget "mips*-*-*"] then {
-    gdb_test "info float" "f0:.*flt:.*dbl:.*" "info float"
+    gdb_test_multiple "info float" "info float" {
+       -re "fpu type: none / unused\r\n$gdb_prompt $" {
+             pass "info float (without FPU)"
+         }
+       -re "fpu type:.*cause.*mask.*flags.*round.*flush.*f0:.*flt:.*dbl:.*$gdb_prompt $" {
+             pass "info float (with FPU)"
+         }
+    }
+} elseif [istarget "nds32*-*-*"] then {
+    gdb_test_multiple "info float" "info_float" {
+        -re "fd0.*fd3.*$gdb_prompt $" {
+            pass "info float (with FPU)"
+       }
+        -re "No floating.point info available for this processor.*$gdb_prompt $" {
+            pass "info float (without FPU)"
+       }
+    }
 } elseif [istarget "powerpc*-*-*"] then {
     gdb_test_multiple "info float" "info_float" {
         -re "f0.*f1.*f31.*fpscr.*$gdb_prompt $" {
             pass "info float (with FPU)"
        }
-        -re "No floating.point info available for this processor.*" {
+        -re "No floating.point info available for this processor.*$gdb_prompt $" {
             pass "info float (without FPU)"
        }
     }
@@ -84,7 +102,7 @@ if { [istarget "alpha*-*-*"] } then {
        -re "fpul.*fr0.*fr1.*fr15.*$gdb_prompt $" {
              pass "info float (with FPU)"
          }
-       -re "No floating.point info available for this processor.*" {
+       -re "No floating.point info available for this processor.*$gdb_prompt $" {
              pass "info float (without FPU)"
        }
     }