gdb/testsuite: Remove hard coded addresses from expected results

In commit:

  commit 6b8c53f2f1c0cf5bee46120d892d4c72571375eb
  Date:   Sat Feb 8 21:26:31 2020 +0000

      gdb/testsuite/fortran: Add mixed language stack test

The test incorrectly included two hard coded addresses in the expected
output, this commit replaces them with the $hex pattern.

gdb/testsuite/ChangeLog:

	* gdb.fortran/mixed-lang-stack.exp: Replace two hard coded address
	with $hex.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e7613f0416b8b068c752092fc5b4349cd2f3f683..b2a94e8d1539a2ec33249c3cf7c224f4e48d4aeb 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-03-23  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * gdb.fortran/mixed-lang-stack.exp: Replace two hard coded address
+       with $hex.
+
 2020-03-20  Tom Tromey  <tromey@adacore.com>
 
        * gdb.dwarf2/dw2-ranges-base.exp: Update regular expressions.

diff --git a/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp b/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp
index df0807e268f28e6482a05aa8bb0e2a0b937d1277..c0531c3fd9f8cf49885e403a61ac4d5c87610112 100644 (file)
--- a/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp
+++ b/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp
@@ -84,9 +84,9 @@ proc run_tests { lang } {
        gdb_test "info frame" "source language c\\+\\+\..*" \
            "info frame in frame #2"
        if { $lang == "fortran" } {
-           set obj_pattern " = \\( base_one = \\( num1 = 1, num2 = 2, num3 = 3 \\), base_two = \\( string = 0x6184e0 'Something in C\\+\\+\\\\000', val = 3.5 \\), xxx = 9, yyy = 10.5 \\)"
+           set obj_pattern " = \\( base_one = \\( num1 = 1, num2 = 2, num3 = 3 \\), base_two = \\( string = $hex 'Something in C\\+\\+\\\\000', val = 3.5 \\), xxx = 9, yyy = 10.5 \\)"
        } else {
-           set obj_pattern " = \\{<base_one> = \\{num1 = 1, num2 = 2, num3 = 3\\}, <base_two> = \\{string = 0x6184e0 \"Something in C\\+\\+\", val = 3.5\\}, xxx = 9, yyy = 10.5\\}"
+           set obj_pattern " = \\{<base_one> = \\{num1 = 1, num2 = 2, num3 = 3\\}, <base_two> = \\{string = $hex \"Something in C\\+\\+\", val = 3.5\\}, xxx = 9, yyy = 10.5\\}"
        }
        gdb_test "print obj" "${obj_pattern}"