Fix gdb.base/msym*.exp failures

AArch64 generates functions without a prologue for these two testcases,
therefore we shouldn't expect the function location to be displayed with
an offset.

gdb/testsuite/ChangeLog:

2020-10-22  Luis Machado  <luis.machado@linaro.org>

	* gdb.base/msym-bp-shl.exp (test_break): Adjust pattern to not
	expected an offset from the function.
	* gdb.base/msym-bp.exp (test): Likewise.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 19b423beb3c2080f50aa6d21ca95f9051013b293..f6084b892b637a75457845526a682ee99e30ff6f 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2020-10-22  Luis Machado  <luis.machado@linaro.org>
+
+       * gdb.base/msym-bp-shl.exp (test_break): Adjust pattern to not
+       expected an offset from the function.
+       * gdb.base/msym-bp.exp (test): Likewise.
+
 2020-10-22  Andrew Burgess  <andrew.burgess@embecosm.com>
 
        * gdb.fortran/array-slices.exp: Add a new test.

diff --git a/gdb/testsuite/gdb.base/msym-bp-shl.exp b/gdb/testsuite/gdb.base/msym-bp-shl.exp
index fee1d7233fd0f42fbf7c3396d579291e1121e9e9..0d860f9b1f86b0119c6b3a715911688bc2364aa6 100644 (file)
--- a/gdb/testsuite/gdb.base/msym-bp-shl.exp
+++ b/gdb/testsuite/gdb.base/msym-bp-shl.exp
@@ -72,7 +72,7 @@ proc test {debug} {
        } else {
            test_info_break_2 \
                "<foo@plt.*>" \
-               "<foo\\+$decimal>"
+               "<foo(\\+$decimal)?>"
        }
     }
 
@@ -96,8 +96,8 @@ proc test {debug} {
                "in foo at .*msym-bp-shl-lib.c:$decimal"
        } else {
            test_info_break_2 \
-               "<foo\\+$decimal>" \
-               "<foo\\+$decimal>"
+               "<foo(\\+$decimal)?>" \
+               "<foo(\\+$decimal)?>"
        }
     }
 }

diff --git a/gdb/testsuite/gdb.base/msym-bp.exp b/gdb/testsuite/gdb.base/msym-bp.exp
index c4bef7c188b0e5574556ec9fdf1b9e767199dfd2..6c39437490ef0f970cca3394386ba87d38e7cabf 100644 (file)
--- a/gdb/testsuite/gdb.base/msym-bp.exp
+++ b/gdb/testsuite/gdb.base/msym-bp.exp
@@ -60,8 +60,8 @@ proc test {debug} {
                    "in foo at .*msym-bp-2.c:$decimal"
            } else {
                test_info_break_2 \
-                   "<foo\\+$decimal>" \
-                   "<foo\\+$decimal>"
+                   "<foo(\\+$decimal)?>" \
+                   "<foo(\\+$decimal)?>"
            }
        }
     }