From ddbb44cf366b652dc9edf2ccd4605f1ed0e2e62d Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 13 Nov 2017 22:06:02 -0500 Subject: [PATCH] gdb.opt/inline-locals.exp: Remove trailing parentheses in test names Test names should not end with parentheses, since the buildbot strips those. gdb/testsuite/ChangeLog: * gdb.opt/inline-locals.exp: Remove trailing parentheses from test names. --- gdb/testsuite/ChangeLog | 5 ++++ gdb/testsuite/gdb.opt/inline-locals.exp | 36 ++++++++++++------------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 7db0afca373..8c57179c34c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-11-13 Simon Marchi + + * gdb.opt/inline-locals.exp: Remove trailing parentheses from + test names. + 2017-11-09 Pedro Alves * gdb.tui/tui-completion.exp (test_tab_completion): New procedure, diff --git a/gdb/testsuite/gdb.opt/inline-locals.exp b/gdb/testsuite/gdb.opt/inline-locals.exp index 104dd48554c..76463a6e313 100644 --- a/gdb/testsuite/gdb.opt/inline-locals.exp +++ b/gdb/testsuite/gdb.opt/inline-locals.exp @@ -34,18 +34,18 @@ set no_frames [skip_inline_frame_tests] set line1 [gdb_get_line_number "set breakpoint 1 here" ${srcfile2}] gdb_breakpoint $srcfile2:$line1 -gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar (1)" +gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar 1" -gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar (2)" +gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar 2" if { ! $no_frames } { gdb_test "backtrace" "#0 bar.*#1 .*func1.*#2 .*main.*" \ - "backtrace from bar (2)" - gdb_test "up" "#1 .*func1 .* at .*" "up from bar (2)" - gdb_test "info frame" ".*inlined into frame.*" "func1 inlined (2)" - gdb_test "info locals" "array = {.*}" "info locals above bar (2)" + "backtrace from bar 2" + gdb_test "up" "#1 .*func1 .* at .*" "up from bar 2" + gdb_test "info frame" ".*inlined into frame.*" "func1 inlined 2" + gdb_test "info locals" "array = {.*}" "info locals above bar 2" - set msg "info args above bar (2)" + set msg "info args above bar 2" gdb_test_multiple "info args" $msg { -re "arg1 = $decimal\r\n$gdb_prompt $" { pass $msg @@ -59,13 +59,13 @@ if { ! $no_frames } { } } } else { - gdb_test "up" "#1 .*main .* at .*" "up from bar (2)" - gdb_test "info locals" ".*arg1 = 0.*" "info locals above bar (2)" + gdb_test "up" "#1 .*main .* at .*" "up from bar 2" + gdb_test "info locals" ".*arg1 = 0.*" "info locals above bar 2" } # Make sure that locals on the stack are found. This is an array to # prevent it from living in a register. -gdb_test "print array\[0\]" "\\\$$decimal = 0" "print local (2)" +gdb_test "print array\[0\]" "\\\$$decimal = 0" "print local 2" if { ! $no_frames } { # Verify that we do not print out variables from the inlined @@ -76,15 +76,15 @@ if { ! $no_frames } { # Repeat the tests from a depth of two inlined functions, and with a # more interesting value in the local array. -gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar (3)" +gdb_test "continue" ".*set breakpoint 1 here.*" "continue to bar 3" if { ! $no_frames } { gdb_test "backtrace" "#0 bar.*#1 .*func1.*#2 .*func2.*#3 .*main.*" \ - "backtrace from bar (3)" - gdb_test "up" "#1 .*func1 .* at .*" "up from bar (3)" - gdb_test "info frame" ".*inlined into frame.*" "func1 inlined (3)" - gdb_test "info locals" "array = {.*}" "info locals above bar (3)" + "backtrace from bar 3" + gdb_test "up" "#1 .*func1 .* at .*" "up from bar 3" + gdb_test "info frame" ".*inlined into frame.*" "func1 inlined 3" + gdb_test "info locals" "array = {.*}" "info locals above bar 3" - set msg "info args above bar (3)" + set msg "info args above bar 3" gdb_test_multiple "info args" $msg { -re "arg1 = $decimal\r\n$gdb_prompt $" { pass $msg @@ -98,9 +98,9 @@ if { ! $no_frames } { } } } else { - gdb_test "up" "#1 .*main .* at .*" "up from bar (3)" + gdb_test "up" "#1 .*main .* at .*" "up from bar 3" gdb_test "info locals" ".*arg1 = 1.*" "info locals above bar (3a)" gdb_test "info locals" ".*arg2 = 184.*" "info locals above bar (3b)" } -gdb_test "print array\[0\]" "\\\$$decimal = 184" "print local (3)" +gdb_test "print array\[0\]" "\\\$$decimal = 184" "print local 3" -- 2.30.2