[PATCH 03/11] Change gdb.base/skip-solib.exp deal with lack of epilogue information

[Bruno Larsen <blarsen@redhat.com>]

When testing with clang, this feature worked, but the test failed
because it checked specifically to see if we were at the main function.
Without epilogue information, the inferior would be at libc_start_main
(or equivalent) instead. Having this test changed would allows us to
identify if the test stops working for real at some point.
---
 gdb/testsuite/gdb.base/skip-solib.exp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/gdb.base/skip-solib.exp b/gdb/testsuite/gdb.base/skip-solib.exp
index ce2b080229e..99833533b6a 100644
--- a/gdb/testsuite/gdb.base/skip-solib.exp
+++ b/gdb/testsuite/gdb.base/skip-solib.exp
@@ -82,7 +82,7 @@ with_test_prefix "ignoring solib file" {
     # We shouldn't step into square(), since we skipped skip-solib-lib.c.
     #
     gdb_test "step" ""
-    gdb_test "bt" "#0\\s+main.*"
+    gdb_test "bt 1" "#0.*main.*"
 }
 
 #
@@ -114,5 +114,12 @@ with_test_prefix "ignoring solib function" {
     # the last line of square.
     #
     gdb_test "step" ""
-    gdb_test "bt" "#0\\s+square.*"
+    gdb_test_multiple "bt 1" "skipped multiply" {
+	-re "#0\\s+square.*" {
+	    pass "skipped multiply"
+	}
+	-re "#0.*main.*" {
+	    pass "skipped multiply"
+	}
+    }
 }
-- 
2.31.1