Files
binutils-gdb/gdb/testsuite/gdb.base/dtrace-probe.exp
Andrew Burgess 25902bd0ba gdb/testsuite: make more use of clean_restart's argument
Commits:

  commit aaad5a3254
  Author: Tom de Vries <tdevries@suse.de>
  Date:   Fri Sep 5 15:36:23 2025 +0200

      [gdb/testsuite] Fix clean_restart <absolute filename> in gdb.base, part 3

  commit 2e61486fce
  Author: Tom de Vries <tdevries@suse.de>
  Date:   Fri Sep 5 15:36:23 2025 +0200

      [gdb/testsuite] Fix clean_restart <absolute filename> in gdb.base, part 2

  commit 202beb3fee
  Author: Tom de Vries <tdevries@suse.de>
  Date:   Fri Sep 5 15:36:23 2025 +0200

      [gdb/testsuite] Fix clean_restart <absolute filename> in gdb.base, part 1

were made to work around the changes to clean_restart in commit:

  commit cba778b944
  Date:   Sun Sep 7 11:53:30 2025 +0200

      [gdb/testsuite] Error out on clean_restart <absolute filename>

These commits added a lot of calls to gdb_load which can be removed in
many cases by passing $testfile to clean_restart, or by switching to
use prepare_for_testing to compile the test executable.

In this commit I've gone through the gdb.base/ directory and removed
as many of the gdb_load calls as possible.  I was only looking for
places where the gdb_load call immediately follows the call to
clean_restart.  And I did skip a few where it was not as simple as
just passing $testfile.

Where possible I've updated tests to use calls to prepare_for_testing,
and simply removed the clean_restart call altogether (this is done as
part of prepare_for_testing).  This is, I think, the best solution.

In other cases I've removed the gdb_load call, and passed $testfile to
clean_restart.  I've preferred $::testfile to adding a 'global'
declaration, and in some cases switching to testfile has allowed me to
remove the 'global binfile' as an additional cleanup.

I ran the complete set of tests that I touched and I didn't see any
regressions, so I don't believe I broke anything.

I know that there are probably gdb_load calls that can be cleaned up
in other testsuite sub-directories, if/when this patch is merged I'll
take a look at those too.

Reviewed-By: Tom de Vries <tdevries@suse.de>
2025-12-01 14:00:47 +00:00

103 lines
3.2 KiB
Plaintext

# Copyright (C) 2014-2025 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
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
load_lib "dtrace.exp"
# Run the tests.
# This returns -1 on failure to compile or start, 0 otherwise.
proc dtrace_test {} {
global testfile hex srcfile
standard_testfile
if {[dtrace_build_usdt_test_program] == -1} {
untested "failed to compile"
return -1
}
clean_restart $testfile
if {![runto_main]} {
return -1
}
gdb_test "print \$_probe_argc" "No probe at PC $hex" \
"check argument not at probe point"
# Test the 'info probes' command.
gdb_test "info probes dtrace" \
"test *progress-counter *$hex +no.*test *two-locations *$hex +always.*test *two-locations *$hex +always.*" \
"info probes dtrace"
# Disabling the probe test:two-locations shall have no effect,
# since no is-enabled probes are defined for it in the object
# file.
gdb_test "disable probe test two-locations" \
"Probe test:two-locations cannot be disabled.*" \
"disable probe test two-locations"
# On the other hand, the probe test:progress-counter can be
# enabled and then disabled again.
gdb_test "enable probe test progress-counter" \
"Probe test:progress-counter enabled.*" \
"enable probe test progress-counter"
gdb_test "disable probe test progress-counter" \
"Probe test:progress-counter disabled.*" \
"disable probe test progress-counter"
# Since test:progress-counter is disabled we can run to the second
# instance of the test:two-locations probe.
runto "-probe-dtrace test:two-locations"
runto "-probe-dtrace test:two-locations"
# Go back to the breakpoint on main() and enable the
# test:progress-counter probe. Set a breakpoint on it and see
# that it gets reached.
if {![runto_main]} {
return -1
}
gdb_test "enable probe test progress-counter" \
"Probe test:progress-counter enabled.*" \
"enable probe test progress-counter"
gdb_test "break -probe-dtrace test:progress-counter" \
".*Breakpoint \[0-9\]+ .*" "set breakpoint in test:progress-counter"
gdb_continue_to_breakpoint "test:progress-counter"
# Test probe arguments.
gdb_test "print \$_probe_argc" " = 2" \
"print \$_probe_argc for probe progress-counter"
gdb_test "print \$_probe_arg0" \
" = $hex \"application\"" \
"print \$_probe_arg0 for probe progress-counter"
gdb_test "print \$_probe_arg1" " = 1" \
"print \$_probe_arg1 for probe progress-counter"
# Set a breakpoint with multiple probe locations.
gdb_test "break -pdtrace test:two-locations" \
"Breakpoint \[0-9\]+ at $hex.*2 locations.*" \
"set multi-location probe breakpoint (probe two-locations)"
return 0
}
dtrace_test