MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gdb: fix duplicate test names in gdb.base/break.exp

Browse Source 
These test names are duplicated:

      2 PASS: gdb.base/break.exp: set breakpoint via non-integer convenience variable disallowed
      2 PASS: gdb.base/break.exp: set convenience variable $foo to 81.5

Wrap them with `with_test_prefix`. I've actually wrapped a bit more
tests that are related, I think it helps to give the test names a bit
more context.  The modified test names are:

    -PASS: gdb.base/break.exp: set convenience variable $foo to bp_location11
    -PASS: gdb.base/break.exp: set breakpoint via convenience variable
    -PASS: gdb.base/break.exp: set convenience variable $foo to 81.5
    -PASS: gdb.base/break.exp: set breakpoint via non-integer convenience variable disallowed
    +PASS: gdb.base/break.exp: set line breakpoint via convenience variable: set convenience variable $foo to bp_location11
    +PASS: gdb.base/break.exp: set line breakpoint via convenience variable: break $foo
    +PASS: gdb.base/break.exp: set line breakpoint via convenience variable: set convenience variable $foo to 81.5
    +PASS: gdb.base/break.exp: set line breakpoint via convenience variable: non-integer convenience variable disallowed

    -PASS: gdb.base/break.exp: set $l = 47
    -PASS: gdb.base/break.exp: break break.c:$l
    -PASS: gdb.base/break.exp: set convenience variable $foo to 81.5
    -PASS: gdb.base/break.exp: set breakpoint via non-integer convenience variable disallowed
    +PASS: gdb.base/break.exp: set line:file breakpoint via convenience variable: set $l = 47
    +PASS: gdb.base/break.exp: set line:file breakpoint via convenience variable: break break.c:$l
    +PASS: gdb.base/break.exp: set line:file breakpoint via convenience variable: set convenience variable $foo to 81.5
    +PASS: gdb.base/break.exp: set line:file breakpoint via convenience variable: non-integer convenience variable disallowed

gdb/testsuite/ChangeLog:

	* gdb.base/break.exp: Use with_test_prefix.
This commit is contained in:
Simon Marchi 2020-04-29 16:34:54 -04:00
parent ed6aceddf5
commit 42e165c30c
2 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2020-04-29 Simon Marchi <simon.marchi@efficios.com>
* gdb.base/break.exp: Use with_test_prefix.
2020-04-29 Tom de Vries <tdevries@suse.de> 2020-04-29 Tom de Vries <tdevries@suse.de>
* lib/gdb.exp (debug_types): New proc. * lib/gdb.exp (debug_types): New proc.

71
gdb/testsuite/gdb.base/break.exp
View File

@ -583,22 +583,25 @@ gdb_test "clear marker3" {Deleted breakpoints [0-9]+ [0-9]+.*}
# Verify that a breakpoint can be set via a convenience variable. # Verify that a breakpoint can be set via a convenience variable.
# #
gdb_test_no_output "set \$foo=$bp_location11" \
"set convenience variable \$foo to bp_location11"
gdb_test "break \$foo" \ with_test_prefix "set line breakpoint via convenience variable" {
"Breakpoint (\[0-9\]*) at .*, line $bp_location11.*" \ gdb_test_no_output "set \$foo=$bp_location11" \
"set breakpoint via convenience variable" "set convenience variable \$foo to bp_location11"
# Verify that GDB responds gracefully to an attempt to set a gdb_test "break \$foo" \
# breakpoint via a convenience variable whose type is not integer. "Breakpoint (\[0-9\]*) at .*, line $bp_location11.*"
#
gdb_test_no_output "set \$foo=81.5" \
"set convenience variable \$foo to 81.5"
gdb_test "break \$foo" \ # Verify that GDB responds gracefully to an attempt to set a
"Convenience variables used in line specs must have integer values.*" \ # breakpoint via a convenience variable whose type is not integer.
"set breakpoint via non-integer convenience variable disallowed" #
gdb_test_no_output "set \$foo=81.5" \
"set convenience variable \$foo to 81.5"
gdb_test "break \$foo" \
"Convenience variables used in line specs must have integer values.*" \
"non-integer convenience variable disallowed"
}
# Verify that we can set and trigger a breakpoint in a user-called function. # Verify that we can set and trigger a breakpoint in a user-called function.
# #
@ -845,30 +848,32 @@ gdb_test_multiple "" $test {
# #
# Test break via convenience variable with file name # Test break via convenience variable with file name
# #
set line [gdb_get_line_number "set breakpoint 1 here"]
gdb_test_no_output "set \$l = $line"
set line_actual "-1" with_test_prefix "set line:file breakpoint via convenience variable" {
set test "break ${srcfile}:\$l" set line [gdb_get_line_number "set breakpoint 1 here"]
gdb_test_multiple "$test" $test { gdb_test_no_output "set \$l = $line"
-re "Breakpoint $decimal at $hex: file .*break\\.c, line ($decimal)\\.\r\n$gdb_prompt $" {
# Save the actual line number on which the breakpoint was set line_actual "-1"
# actually set. On some systems (Eg: Ubuntu 16.04 with GCC set test "break ${srcfile}:\$l"
# version 5.4.0), that line gets completely inlined, including gdb_test_multiple "$test" $test {
# the call to printf, and so we end up inserting the breakpoint -re "Breakpoint $decimal at $hex: file .*break\\.c, line ($decimal)\\.\r\n$gdb_prompt $" {
# on one of the following lines instead. # Save the actual line number on which the breakpoint was
set line_actual $expect_out(1,string) # actually set. On some systems (Eg: Ubuntu 16.04 with GCC
pass $test # version 5.4.0), that line gets completely inlined, including
# the call to printf, and so we end up inserting the breakpoint
# on one of the following lines instead.
set line_actual $expect_out(1,string)
pass $test
}
} }
gdb_test_no_output "set \$foo=81.5" \
"set convenience variable \$foo to 81.5"
gdb_test "break $srcfile:\$foo" \
"Convenience variables used in line specs must have integer values.*" \
"non-integer convenience variable disallowed"
} }
gdb_test_no_output "set \$foo=81.5" \
"set convenience variable \$foo to 81.5"
gdb_test "break $srcfile:\$foo" \
"Convenience variables used in line specs must have integer values.*" \
"set breakpoint via non-integer convenience variable disallowed"
# #
# Test that commands can be cleared without error. # Test that commands can be cleared without error.
# #