From 6e8922974295dc8bee77a554783f6308adfecab5 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Tue, 16 Mar 2021 10:21:40 +0000 Subject: [PATCH] gdb/testsuite: remove duplicate test names from gdb.cp/gdb2384.exp The test gdb.cp/gdb2384.exp contains some duplicate test names, and also some test names with a string inside parentheses at the end. In order to resolve the duplicates the obvious choice would be to add yet more strings inside parentheses at the end of names, however, this is discouraged in our test naming scheme. The string in parentheses originates from a comment in the test source code, which naturally leads to including this comment in the test name. In this commit I have changed the comment in the test source to remove the string in parentheses, I then rename the tests in the .exp script to match, making sure that all test names are unique. There should be no change in test coverage after this commit. gdb/testsuite/ChangeLog: * gdb.cp/gdb2384.cc (main): Change comments used for breakpoints. * gdb.cp/gdb2384.exp: Change and extend test names to avoid duplicates, and also to avoid having a string inside parentheses at the end of test names. --- gdb/testsuite/ChangeLog | 7 +++++++ gdb/testsuite/gdb.cp/gdb2384.cc | 4 ++-- gdb/testsuite/gdb.cp/gdb2384.exp | 20 ++++++++++---------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 413cd4c7f91..3fe36b3db46 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2021-03-26 Andrew Burgess + + * gdb.cp/gdb2384.cc (main): Change comments used for breakpoints. + * gdb.cp/gdb2384.exp: Change and extend test names to avoid + duplicates, and also to avoid having a string inside parentheses + at the end of test names. + 2021-03-26 Andrew Burgess * gdb.cp/nsusing.exp: Rewrite test, remove a duplicate test block. diff --git a/gdb/testsuite/gdb.cp/gdb2384.cc b/gdb/testsuite/gdb.cp/gdb2384.cc index 7c734bd158a..07967b07a01 100644 --- a/gdb/testsuite/gdb.cp/gdb2384.cc +++ b/gdb/testsuite/gdb.cp/gdb2384.cc @@ -46,7 +46,7 @@ main () { derived1 d1 (42); derived2 d2 (24); - g = d1.meth (); // set breakpoint here - g = d2.meth (); // set breakpoint here (second) + g = d1.meth (); // First breakpoint + g = d2.meth (); // Second breakpoint return 0; } diff --git a/gdb/testsuite/gdb.cp/gdb2384.exp b/gdb/testsuite/gdb.cp/gdb2384.exp index 69f9709f7a4..db032065186 100644 --- a/gdb/testsuite/gdb.cp/gdb2384.exp +++ b/gdb/testsuite/gdb.cp/gdb2384.exp @@ -49,8 +49,8 @@ if ![runto_main] then { return -1 } -gdb_breakpoint [gdb_get_line_number "set breakpoint here"] -gdb_continue_to_breakpoint "set breakpoint here" +gdb_breakpoint [gdb_get_line_number "First breakpoint"] +gdb_continue_to_breakpoint "run to 'First breakpoint', first time" gdb_test "print d1.meth ()" \ ".*42.*" @@ -58,25 +58,25 @@ gdb_test "print d1.meth ()" \ # Now try again. gdb's without the fix will hopefully segv here runto_main -gdb_breakpoint [gdb_get_line_number "set breakpoint here"] -gdb_continue_to_breakpoint "set breakpoint here" +gdb_breakpoint [gdb_get_line_number "First breakpoint"] +gdb_continue_to_breakpoint "run to 'First breakpoint', second time" gdb_test "print d1.meth ()" \ ".*42.*" \ - "gdb2384" + "gdb2384 at 'First breakpoint'" # second case runto_main -gdb_breakpoint [gdb_get_line_number "set breakpoint here (second)"] -gdb_continue_to_breakpoint "set breakpoint here (second)" +gdb_breakpoint [gdb_get_line_number "Second breakpoint"] +gdb_continue_to_breakpoint "run to 'Second breakpoint', first time" gdb_test "print d2.meth ()" \ ".*24.*" \ "print d2.meth()" runto_main -gdb_breakpoint [gdb_get_line_number "set breakpoint here (second)"] -gdb_continue_to_breakpoint "set breakpoint here (second)" +gdb_breakpoint [gdb_get_line_number "Second breakpoint"] +gdb_continue_to_breakpoint "run to 'Second breakpoint', second time" gdb_test "print d2.meth ()" \ ".*24.*" \ - "gdb2384 (second)" + "gdb2384 at 'Second breakpoint'" -- 2.30.2