From: Andrew Burgess Date: Mon, 8 Mar 2021 18:34:08 +0000 (+0000) Subject: gdb/testsuite: resolve remaining duplicate test names in gdb.python/*.exp X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7f99d636c2b30fbcee569b7add37d255677e502a;p=binutils-gdb.git gdb/testsuite: resolve remaining duplicate test names in gdb.python/*.exp This commit resolves the remaining duplicate test names in the gdb.python/ directory, there's 1 duplicate per test script. In each case I have just extended some test names to make them more descriptive. gdb/testsuite/ChangeLog: * gdb.python/py-bad-printers.exp: Extend test names to make them unique. * gdb.python/py-events.exp: Likewise. * gdb.python/py-finish-breakpoint2.exp: Likewise. * gdb.python/py-frame-inline.exp: Likewise. * gdb.python/py-frame.exp: Likewise. * gdb.python/py-infthread.exp: Likewise. --- diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 9ca0a1288f9..6eddfc16c39 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2021-03-12 Andrew Burgess + + * gdb.python/py-bad-printers.exp: Extend test names to make them + unique. + * gdb.python/py-events.exp: Likewise. + * gdb.python/py-finish-breakpoint2.exp: Likewise. + * gdb.python/py-frame-inline.exp: Likewise. + * gdb.python/py-frame.exp: Likewise. + * gdb.python/py-infthread.exp: Likewise. + 2021-03-12 Andrew Burgess * gdb.python/py-value-cc.exp: Remove a duplicate test. diff --git a/gdb/testsuite/gdb.python/py-bad-printers.exp b/gdb/testsuite/gdb.python/py-bad-printers.exp index d838369df8b..708f0e0c5c9 100644 --- a/gdb/testsuite/gdb.python/py-bad-printers.exp +++ b/gdb/testsuite/gdb.python/py-bad-printers.exp @@ -44,10 +44,13 @@ gdb_test "enable pretty-printer global bad-printers;container1" \ "printers enabled" gdb_test "disable pretty-printer global bad-printers;container2" \ "printers enabled" -gdb_test "print c" "Result of children iterator not a tuple of two elements.*" +gdb_test "print c" \ + "Result of children iterator not a tuple of two elements.*" \ + "print c, children method doesn't return a tuple" gdb_test "enable pretty-printer global bad-printers;container2" \ "printers enabled" gdb_test "disable pretty-printer global bad-printers;container1" \ "printers enabled" -gdb_test "print c" "Bad result from children iterator.*" +gdb_test "print c" "Bad result from children iterator.*" \ + "print c, children method returns a malformed tuple" diff --git a/gdb/testsuite/gdb.python/py-events.exp b/gdb/testsuite/gdb.python/py-events.exp index f1ea3d1de8c..e89cd8b021b 100644 --- a/gdb/testsuite/gdb.python/py-events.exp +++ b/gdb/testsuite/gdb.python/py-events.exp @@ -234,4 +234,4 @@ gdb_test_no_output "set variable \$x = 32" "do something" gdb_test "python print(count)" 2 "check for before_prompt event" gdb_test_no_output "xxz" "run a canned sequence" -gdb_test "python print(count)" 4 "check for before_prompt event" +gdb_test "python print(count)" 4 "check for before_prompt event again" diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp index 10c4b6e81b8..58e086ad3b4 100644 --- a/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp +++ b/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp @@ -48,10 +48,12 @@ gdb_breakpoint "throw_exception_1" gdb_test "continue" "Breakpoint .*throw_exception_1.*" "run to exception 1" gdb_test "python print (len(gdb.breakpoints()))" "3" "check BP count" -gdb_test "python ExceptionFinishBreakpoint(gdb.newest_frame())" "init ExceptionFinishBreakpoint" "set FinishBP after the exception" +gdb_test "python ExceptionFinishBreakpoint(gdb.newest_frame())" \ + "init ExceptionFinishBreakpoint" "set FinishBP after the exception" gdb_test "continue" ".*stopped at ExceptionFinishBreakpoint.*" "check FinishBreakpoint in catch()" gdb_test "python print (len(gdb.breakpoints()))" "3" "check finish BP removal" gdb_test "continue" ".*Breakpoint.* throw_exception_1.*" "continue to second exception" -gdb_test "python ExceptionFinishBreakpoint(gdb.newest_frame())" "init ExceptionFinishBreakpoint" "set FinishBP after the exception" +gdb_test "python ExceptionFinishBreakpoint(gdb.newest_frame())" \ + "init ExceptionFinishBreakpoint" "set FinishBP after the exception again" gdb_test "continue" ".*exception did not finish.*" "FinishBreakpoint with exception thrown not caught" diff --git a/gdb/testsuite/gdb.python/py-frame-inline.exp b/gdb/testsuite/gdb.python/py-frame-inline.exp index 9fb3016a781..211c930ce50 100644 --- a/gdb/testsuite/gdb.python/py-frame-inline.exp +++ b/gdb/testsuite/gdb.python/py-frame-inline.exp @@ -48,7 +48,7 @@ gdb_test "python print (gdb.selected_frame().read_var('l'))" "\r\n42" # the frame cache is flushed somehow after setting the limit, to force # frame id recomputation. gdb_test_no_output "set backtrace limit 1" -gdb_continue_to_breakpoint "Block break here." +gdb_continue_to_breakpoint "Block break here again." gdb_test "python print (gdb.newest_frame())" ".*" diff --git a/gdb/testsuite/gdb.python/py-frame.exp b/gdb/testsuite/gdb.python/py-frame.exp index e092e279ff7..a6a5c0de726 100644 --- a/gdb/testsuite/gdb.python/py-frame.exp +++ b/gdb/testsuite/gdb.python/py-frame.exp @@ -83,7 +83,8 @@ gdb_test "python print ('result = %s' % (f0 != f0))" " = False" "test inequality gdb_test "python print ('result = %s' % f0.is_valid ())" " = True" "test Frame.is_valid" gdb_test "python print ('result = %s' % f0.name ())" " = f2" "test Frame.name" gdb_test "python print ('result = %s' % (f0.type () == gdb.NORMAL_FRAME))" " = True" "test Frame.type" -gdb_test "python print ('result = %s' % (f0.unwind_stop_reason () == gdb.FRAME_UNWIND_NO_REASON))" " = True" "test Frame.type" +gdb_test "python print ('result = %s' % (f0.unwind_stop_reason () == gdb.FRAME_UNWIND_NO_REASON))" \ + " = True" "test Frame.unwind_stop_reason" gdb_test "python print ('result = %s' % gdb.frame_stop_reason_string (gdb.FRAME_UNWIND_INNER_ID))" " = previous frame inner to this frame \\(corrupt stack\\?\\)" "test gdb.frame_stop_reason_string" gdb_test "python print ('result = %s' % f0.pc ())" " = \[0-9\]+" "test Frame.pc" gdb_test "python print ('result = %s' % (f0.older () == f1))" " = True" "test Frame.older" diff --git a/gdb/testsuite/gdb.python/py-infthread.exp b/gdb/testsuite/gdb.python/py-infthread.exp index 6f81a1c932f..aa0b802a11e 100644 --- a/gdb/testsuite/gdb.python/py-infthread.exp +++ b/gdb/testsuite/gdb.python/py-infthread.exp @@ -89,4 +89,5 @@ gdb_test "python print ('result = %s' % t0.is_exited ())" " = False" "test Infer gdb_test "python print ('result = %s' % t0.is_valid ())" " = True" "test InferiorThread.is_valid" gdb_test_no_output "kill inferior 1" "kill inferior 1" -gdb_test "python print ('result = %s' % t0.is_valid ())" " = False" "test InferiorThread.is_valid" +gdb_test "python print ('result = %s' % t0.is_valid ())" " = False" \ + "test InferiorThread.is_valid after thread has been killed"