Adjust gdb.mi/mi-sym-info.exp filename patterns.

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.mi / gdb2549.exp

diff --git a/gdb/testsuite/gdb.mi/gdb2549.exp b/gdb/testsuite/gdb.mi/gdb2549.exp
index 5a316ef325eab17ff278e8f90e56111083a1ae80..cc6441c8ec0d4ff74c4b6c6a1930fc91cf273fd1 100644 (file)
--- a/gdb/testsuite/gdb.mi/gdb2549.exp
+++ b/gdb/testsuite/gdb.mi/gdb2549.exp
@@ -1,4 +1,4 @@
-# Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright 2008-2020 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
@@ -30,10 +30,9 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
+standard_testfile basics.c
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi-regs.exp
      return -1
 }
@@ -41,7 +40,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 proc register_tests_no_exec { } {
        # Test the generic IDT chip.
        mi_gdb_test "111-data-list-register-values" \
-               ".*111\\^error,msg=\"mi_cmd_data_list_register_values: Usage: -data-list-register-values <format> \\\[<regnum1>...<regnumN>\\\]\"" \
+           ".*111\\^error,msg=\"-data-list-register-values: Usage: -data-list-register-values \\\[--skip-unavailable\\\] <format> \\\[<regnum1>...<regnumN>\\\]\"" \
                "wrong arguments"
 
        mi_gdb_test "111-data-list-register-values x" \
@@ -52,29 +51,56 @@ proc register_tests_no_exec { } {
 proc register_tests { } {
     global hex
     global decimal
+    global mi_gdb_prompt
     set octal "\[0-7\]+"
     set binary "\[0-1\]+"
     set float "\\-?((\[0-9\]+(\\.\[0-9\]+)?(e\[-+\]\[0-9\]+)?)|(nan\\($hex\\)))"
 
     mi_gdb_test "222-data-list-register-values x" \
-           "222\\^done,register-values=\\\[\{number=\"0\",value=\"$hex\"\}.*\\\]" \
+           "222\\^done,register-values=\\\[\{number=\"$decimal\",value=\"$hex\"\}.*\\\]" \
            "register values x"
 
     mi_gdb_test "333-data-list-register-values f" \
-           "333\\^done,register-values=\\\[\{number=\"0\",value=\"$float\"\}.*\\\]" \
+           "333\\^done,register-values=\\\[\{number=\"$decimal\",value=\"$float\"\}.*\\\]" \
            "register values f"
 
     mi_gdb_test "444-data-list-register-values d" \
-           "444\\^done,register-values=\\\[\{number=\"0\",value=\"-?$decimal\"\}.*\\\]" \
+           "444\\^done,register-values=\\\[\{number=\"$decimal\",value=\"-?$decimal\"\}.*\\\]" \
            "register values d"
 
     mi_gdb_test "555-data-list-register-values o" \
-           "555\\^done,register-values=\\\[\{number=\"0\",value=\"$octal\"\}.*\\\]" \
+           "555\\^done,register-values=\\\[\{number=\"$decimal\",value=\"$octal\"\}.*\\\]" \
            "register values o"
 
-    mi_gdb_test "666-data-list-register-values t" \
-           "666\\^done,register-values=\\\[\{number=\"0\",value=\"$binary\"\}.*\\\]" \
-           "register values t"
+    set cmd "666-data-list-register-values t"
+    set test "register values t"
+    set state 0
+    gdb_test_multiple $cmd $test -prompt "$mi_gdb_prompt$" {
+       -re "666\\^done,register-values=\\\[" {
+           if { $state == 0 } {
+               set state 1
+               exp_continue
+           }
+           fail $gdb_test_name
+       }
+       -re "\{number=\"$decimal\",value=\"$binary\"\}" {
+           if { $state != 0 } {
+               set state 2
+               exp_continue
+           }
+           fail $gdb_test_name
+       }
+       -re "\{number=\"$decimal\",value=\"\[^\"\]*\"\}" {
+           exp_continue
+       }
+       -re "\]\r\n$mi_gdb_prompt$" {
+           if { $state == 2 } {
+               pass $gdb_test_name
+           } else {
+               fail $gdb_test_name
+           }
+       }
+    }
 }
 
 register_tests_no_exec