[gdb/testsuite] Improve probe detection in gdb.base/break-probes.exp

[binutils-gdb.git] / gdb / testsuite / gdb.base / break-probes.exp

diff --git a/gdb/testsuite/gdb.base/break-probes.exp b/gdb/testsuite/gdb.base/break-probes.exp
index 08513ddbb216cabb6e4af704d196a8e6115f632a..b633ae6f4e9a82fa3a95e0d10bf887cd4a5cb7d2 100644 (file)
--- a/gdb/testsuite/gdb.base/break-probes.exp
+++ b/gdb/testsuite/gdb.base/break-probes.exp
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Free Software Foundation, Inc.
+# Copyright 2012-2021 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
@@ -23,15 +23,7 @@ set libname $testfile-solib
 set srcfile_lib $srcdir/$subdir/$libname.c
 set binfile_lib [standard_output_file $libname.so]
 
-if { [istarget "*bsd*"] } {
-  set normal_bp "r_debug_state"
-} else {
-  set normal_bp "_dl_debug_state"
-}
-set probes_bp "dl_main"
-
-if { [gdb_compile_shlib $srcfile_lib $binfile_lib \
-         [list additional_flags=-fPIC]] != "" } {
+if { [gdb_compile_shlib $srcfile_lib $binfile_lib {}] != "" } {
     untested "failed to compile shared library"
     return -1
 }
@@ -48,47 +40,64 @@ gdb_test_no_output "set stop-on-solib-events 1"
 gdb_run_cmd
 gdb_test "" ".*Stopped due to shared library event.*"
 
-# XFAIL if we are not using probes
-set test "ensure using probes"
+# Check if we're using probes.
 set using_probes 0
-gdb_test_multiple "bt" $test {
-    -re "#0 +\[^\r\n\]*\\m(__GI_)?$normal_bp\\M.*$gdb_prompt $" {
-       untested "probes not present on this system"
+
+# Get PC.
+set pc ""
+gdb_test_multiple "p /x \$pc" "" {
+    -re -wrap " = ($hex)" {
+       set pc $expect_out(1,string)
     }
-    -re "#0 +\[^\r\n\]*\\m(__GI_)?$probes_bp\\M.*$gdb_prompt $" {
-       pass $test
+    -re -wrap "" {
+    }
+}
+if { $pc == "" } {
+    unsupported "Couldn't get $pc"
+    return -1
+}
+regsub "0x0*" $pc "" pc
+
+# Verify that pc is at info_start probe address.
+gdb_test_multiple "info probes stap rtld" "" {
+    -re -wrap "init_start +0x0*$pc .*" {
        set using_probes 1
     }
+    -re -wrap "" {
+    }
 }
 
-if { $using_probes } {
-    set sysroot ""
-    set test "show sysroot"
-    gdb_test_multiple $test $test {
-       -re "The current system root is \"(.*)\"\..*${gdb_prompt} $" {
-           set sysroot $expect_out(1,string)
-       }
+if { ! $using_probes } {
+    unsupported "probes not present on this system"
+    return -1
+}
+
+set sysroot ""
+set test "show sysroot"
+gdb_test_multiple $test $test {
+    -re "The current system root is \"(.*)\"\..*${gdb_prompt} $" {
+       set sysroot $expect_out(1,string)
     }
+}
 
-    # GDB strips "target:" from the start of filenames
-    # when operating on the local filesystem
-    regsub "^target:" "$sysroot" "(target:)?" sysroot
-
-    # Run til it loads our library
-    set test "run til our library loads"
-    set not_loaded_library 1
-    while { $not_loaded_library } {
-       set not_loaded_library 0
-       gdb_test_multiple "c" $test {
-           -re "Inferior loaded $sysroot$binfile_lib\\M.*$gdb_prompt $" {
-               pass $test
-           }
-           -re "Stopped due to shared library event\\M.*$gdb_prompt $" {
-               set not_loaded_library 1
-           }
+# GDB strips "target:" from the start of filenames
+# when operating on the local filesystem
+regsub "^target:" "$sysroot" "(target:)?" sysroot
+
+# Run til it loads our library
+set test "run til our library loads"
+set not_loaded_library 1
+while { $not_loaded_library } {
+    set not_loaded_library 0
+    gdb_test_multiple "c" $test {
+       -re "Inferior loaded $sysroot$binfile_lib\\M.*$gdb_prompt $" {
+           pass $test
+       }
+       -re "Stopped due to shared library event\\M.*$gdb_prompt $" {
+           set not_loaded_library 1
        }
     }
-
-    # Call something to ensure that relocation occurred
-    gdb_test "call (int) foo(23)" "\\\$.* = 31.*\\\M.*"
 }
+
+# Call something to ensure that relocation occurred
+gdb_test "call (int) foo(23)" "\\\$.* = 31.*\\\M.*"