From b6cb5e17b84787f6832e2d35602dd17ed3855e62 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 23 Nov 2022 13:39:47 -0500 Subject: [PATCH] gdb/testsuite/gdb.base/break.exp: split test_break_file_line_convenience_var Change-Id: I0c31b037669b2917e062bf431372fb6531f8f53c Approved-By: Kevin Buettner --- gdb/testsuite/gdb.base/break.exp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp index c0756cdccc2..be349d9e7ea 100644 --- a/gdb/testsuite/gdb.base/break.exp +++ b/gdb/testsuite/gdb.base/break.exp @@ -868,18 +868,18 @@ gdb_test_multiple "" $test { } } -# # Test break via convenience variable with file name -# -with_test_prefix "set line:file breakpoint via convenience variable" { +proc_with_prefix test_break_file_line_convenience_var {} { + clean_restart breako2 + set line [gdb_get_line_number "set breakpoint 1 here"] gdb_test_no_output "set \$l = $line" set line_actual "-1" - set test "break ${srcfile}:\$l" + set test "break $::srcfile:\$l" gdb_test_multiple "$test" $test { - -re "Breakpoint $decimal at $hex: file .*break\\.c, line ($decimal)\\.\r\n$gdb_prompt $" { + -re "Breakpoint $::decimal at $::hex: file .*break\\.c, line ($::decimal)\\.\r\n$::gdb_prompt $" { # Save the actual line number on which the breakpoint was # actually set. On some systems (Eg: Ubuntu 16.04 with GCC # version 5.4.0), that line gets completely inlined, including @@ -892,11 +892,13 @@ with_test_prefix "set line:file breakpoint via convenience variable" { gdb_test_no_output "set \$foo=81.5" \ "set convenience variable \$foo to 81.5" - gdb_test "break $srcfile:\$foo" \ + gdb_test "break $::srcfile:\$foo" \ "Convenience variables used in line specs must have integer values.*" \ "non-integer convenience variable disallowed" } +test_break_file_line_convenience_var + # Test that commands can be cleared without error. proc_with_prefix test_break_commands_clear {} { -- 2.30.2