Files
binutils-gdb/gdb/testsuite/gdb.base/varargs.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

104 lines
2.9 KiB
Plaintext

# Copyright 1997-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/>. */
# This file was written by Elena Zannoni (ezannoni@cygnus.com)
# this file tests command line calls with functions having variable
# args list
# corresponding source file: varargs.c
#print find_max1(5,1,2,3,4,5)
#print find_max1(1,3)
#call find_max1(10,1,2,3,4,5,6,7,8,29,0)
#print find_max2(3,1,2,3)
#print find_max_double(5,1.0,17.0,2.0,3.0,4.0)
#quit
standard_testfile .c
set allow_float_test [allow_float_test]
set flags {}
lappend flags debug
lappend_include_file flags $srcdir/lib/unbuffer_output.c
if {[support_complex_tests]} {
lappend flags "additional_flags=-DTEST_COMPLEX"
}
if { [prepare_for_testing "prepare" $testfile $srcfile $flags] != 0 } {
return
}
gdb_test_no_output "set print sevenbit-strings"
gdb_test_no_output "set print address off"
gdb_test_no_output "set width 0"
if {[gdb_skip_stdio_test "varargs.exp"]} {
# Nothing in this module is testable without printf.
return
}
if {![runto test]} {
return
}
gdb_test_stdio "print find_max1(5,1,2,3,4,5)" \
"find_max\\(5, 1, 2, 3, 4, 5\\) returns 5\[ \r\n\]+" \
".\[0-9\]+ = 5" \
"print find_max1(5,1,2,3,4,5)"
gdb_test_stdio "print find_max1(1,3)" \
"find_max\\(1, 3\\) returns 3\[ \r\n\]+" \
".\[0-9\]+ = 3" \
"print find_max1(1,3)"
gdb_test_stdio "print find_max1(10,1,2,3,4,5,6,7,8,29,0)" \
"find_max\\(10, 1, 2, 3, 4, 5, 6, 7, 8, 29, 0\\) returns 29\[ \r\n\]+" \
".\[0-9\]+ = 29"
gdb_test_stdio "print find_max2(3,1,2,3)" \
"find_max\\(3, 1, 2, 3\\) returns 3\[ \r\n\]+" \
".\[0-9\]+ = 3" \
"print find_max2(3,1,2,3)"
if {$allow_float_test} {
gdb_test_stdio "print find_max_double(5,1.0,17.0,2.0,3.0,4.0)" \
"find_max\\(.*\\) returns 17\\.000000\[ \r\n\]+" \
".\[0-9\]+ = 17" \
"print find_max_double(5,1.0,17.0,2.0,3.0,4.0)"
}
# Test _Complex type here if supported.
if {[support_complex_tests]} {
global gdb_prompt
set test "print find_max_float_real(4, fc1, fc2, fc3, fc4)"
gdb_test $test ".*= 4 \\+ 4i"
set test "print find_max_double_real(4, dc1, dc2, dc3, dc4)"
gdb_test $test ".*= 4 \\+ 4i"
set test "print find_max_long_double_real(4, ldc1, ldc2, ldc3, ldc4)"
gdb_test $test ".*= 4 \\+ 4i"
set test "print find_max_struct_long_double_real(4, sldc1, sldc2, sldc3, sldc4)"
gdb_test $test ".*= 4 \\+ 4i"
}