diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 20535538383..841078a3fe1 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2020-12-30 Simon Marchi + + * gdb.python/py-frame-args.exp: De-duplicate test names. + 2020-12-24 Andrew Burgess PR gdb/27059 diff --git a/gdb/testsuite/gdb.python/py-frame-args.exp b/gdb/testsuite/gdb.python/py-frame-args.exp index fd9c1f43423..d820f0b5791 100644 --- a/gdb/testsuite/gdb.python/py-frame-args.exp +++ b/gdb/testsuite/gdb.python/py-frame-args.exp @@ -38,32 +38,36 @@ gdb_continue_to_breakpoint "break-here" ".* break-here .*" gdb_test_no_output "set print raw-frame-arguments off" -gdb_test_no_output "set print frame-arguments none" -gdb_test "frame" ".*foo \\(x=\[.\]{3}, ss=\[.\]{3}\\).*" \ - "frame pretty,none" +with_test_prefix "pretty frame args" { + gdb_test_no_output "set print frame-arguments none" + gdb_test "frame" ".*foo \\(x=\[.\]{3}, ss=\[.\]{3}\\).*" \ + "none" -gdb_test_no_output "set print frame-arguments scalars" -gdb_test "frame" ".*foo \\(x=42, ss=super struct = {\[.\]{3}}\\).*" \ - "frame pretty,scalars" + gdb_test_no_output "set print frame-arguments scalars" + gdb_test "frame" ".*foo \\(x=42, ss=super struct = {\[.\]{3}}\\).*" \ + "scalars" -gdb_test_no_output "set print frame-arguments all" -gdb_test "frame" \ - ".*foo \\(x=42, ss=super struct = {a = m=<1>, b = m=<2>}\\).*" \ - "frame pretty,all" + gdb_test_no_output "set print frame-arguments all" + gdb_test "frame" \ + ".*foo \\(x=42, ss=super struct = {a = m=<1>, b = m=<2>}\\).*" \ + "all" +} # Test all combinations with raw on. gdb_test_no_output "set print raw-frame-arguments on" -gdb_test_no_output "set print frame-arguments none" -gdb_test "frame" ".*foo \\(x=\[.\]{3}, ss=\[.\]{3}\\).*" \ - "frame raw,none" +with_test_prefix "raw frame args" { + gdb_test_no_output "set print frame-arguments none" + gdb_test "frame" ".*foo \\(x=\[.\]{3}, ss=\[.\]{3}\\).*" \ + "none" -gdb_test_no_output "set print frame-arguments scalars" -gdb_test "frame" ".*foo \\(x=42, ss=\[.\]{3}\\).*" \ - "frame raw,scalars" + gdb_test_no_output "set print frame-arguments scalars" + gdb_test "frame" ".*foo \\(x=42, ss=\[.\]{3}\\).*" \ + "scalars" -gdb_test_no_output "set print frame-arguments all" -gdb_test "frame" \ - ".*foo \\(x=42, ss={a = {m = 1}, b = {m = 2}}\\).*" \ - "frame raw,all" + gdb_test_no_output "set print frame-arguments all" + gdb_test "frame" \ + ".*foo \\(x=42, ss={a = {m = 1}, b = {m = 2}}\\).*" \ + "all" +}