Fixes for gdb.xml/tdesc-regs.exp.

2020-06-19  Sandra Loosemore  <sandra@codesourcery.com>
	    Hafiz Abid Qadeer  <abidh@codesourcery.com>

	* gdb.xml/tdesc-regs.exp (load_description): Correct pathname of
	file sent to remote host.
	(top level): Allow int32_t as type of 32-bit register.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index daed3930f51d7b4b0ee0174856d1b66edcca4f58..36662f910b88cd0272a56be9d68b501fb5850684 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2020-06-19  Sandra Loosemore  <sandra@codesourcery.com>
+           Hafiz Abid Qadeer  <abidh@codesourcery.com>
+
+       * gdb.xml/tdesc-regs.exp (load_description): Correct pathname of
+       file sent to remote host.
+       (top level): Allow int32_t as type of 32-bit register.
+
 2020-06-19  Tom de Vries  <tdevries@suse.de>
 
        * lib/gdb.exp (gdb_note): New proc.

diff --git a/gdb/testsuite/gdb.xml/tdesc-regs.exp b/gdb/testsuite/gdb.xml/tdesc-regs.exp
index bb04420b246aceaa18517c5a45e44bd4edd18e2b..8107619fc684807c3d4be2b8b2aeec28923c4b14 100644 (file)
--- a/gdb/testsuite/gdb.xml/tdesc-regs.exp
+++ b/gdb/testsuite/gdb.xml/tdesc-regs.exp
@@ -145,7 +145,7 @@ proc load_description { file errmsg xml_file } {
     close $ofd
 
     if {[is_remote host]} {
-       set regs_file [remote_download host "$subdir/$xml_file" $xml_file]
+       set regs_file [remote_download host "$regs_file" $xml_file]
     }
 
     # Anchor the test output, so that error messages are detected.
@@ -165,7 +165,7 @@ if {![is_remote host]} {
 }
 
 load_description "extra-regs.xml" "" "test-extra-regs.xml"
-gdb_test "ptype \$extrareg" "type = (int|long|long long)"
+gdb_test "ptype \$extrareg" "type = (int32_t|int|long|long long)"
 gdb_test "ptype \$uintreg" "type = uint32_t"
 gdb_test "ptype \$vecreg" "type = int8_t __attribute__ \\(\\(vector_size\\(4\\)\\)\\)"
 gdb_test "ptype \$unionreg" \