From 2e86a2830cfef688a27e17353b84f59f8147ab23 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 8 Mar 2017 14:05:41 +0000 Subject: [PATCH] gdb.arch/amd64-entry-value-param*.exp: Make sure test messages are unique gdb/testsuite/ChangeLog: 2017-03-08 Pedro Alves * gdb.arch/amd64-entry-value-param-dwarf5.exp: Use with_test_prefix. * gdb.arch/amd64-entry-value-param.exp: Use with_test_prefix. --- gdb/testsuite/ChangeLog | 5 ++++ .../amd64-entry-value-param-dwarf5.exp | 24 ++++++++++++------- .../gdb.arch/amd64-entry-value-param.exp | 24 ++++++++++++------- 3 files changed, 35 insertions(+), 18 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 26135e52ce9..4575e2784fa 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-03-08 Pedro Alves + + * gdb.arch/amd64-entry-value-param-dwarf5.exp: Use with_test_prefix. + * gdb.arch/amd64-entry-value-param.exp: Use with_test_prefix. + 2017-03-08 Pedro Alves * gdb.arch/i386-pkru.exp (probe PKRU support): Handle detecting diff --git a/gdb/testsuite/gdb.arch/amd64-entry-value-param-dwarf5.exp b/gdb/testsuite/gdb.arch/amd64-entry-value-param-dwarf5.exp index 0357ff406d7..bbaffd376dc 100644 --- a/gdb/testsuite/gdb.arch/amd64-entry-value-param-dwarf5.exp +++ b/gdb/testsuite/gdb.arch/amd64-entry-value-param-dwarf5.exp @@ -36,14 +36,20 @@ if ![runto_main] { set srcfile $srcfile2 gdb_breakpoint [gdb_get_line_number "break-here"] -gdb_continue_to_breakpoint "break-here" ".* break-here .*" -gdb_test "p y" " = 2" -gdb_test "p b" " = 4" +with_test_prefix "call 1" { + gdb_continue_to_breakpoint "break-here" ".* break-here .*" + gdb_test "p y" " = 2" + gdb_test "p b" " = 4" +} -gdb_continue_to_breakpoint "break-here" ".* break-here .*" -gdb_test "p y" " = 4" -gdb_test "p b" " = 8" +with_test_prefix "call 2" { + gdb_continue_to_breakpoint "break-here" ".* break-here .*" + gdb_test "p y" " = 4" + gdb_test "p b" " = 8" +} -gdb_continue_to_breakpoint "break-here" ".* break-here .*" -gdb_test "p y" " = 10" -gdb_test "p b" " = 20" +with_test_prefix "call 3" { + gdb_continue_to_breakpoint "break-here" ".* break-here .*" + gdb_test "p y" " = 10" + gdb_test "p b" " = 20" +} diff --git a/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp b/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp index c0072ac00c8..2ec9c31e8ef 100644 --- a/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp +++ b/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp @@ -36,14 +36,20 @@ if ![runto_main] { set srcfile $srcfile2 gdb_breakpoint [gdb_get_line_number "break-here"] -gdb_continue_to_breakpoint "break-here" ".* break-here .*" -gdb_test "p y" " = 2" -gdb_test "p b" " = 4" +with_test_prefix "call 1" { + gdb_continue_to_breakpoint "break-here" ".* break-here .*" + gdb_test "p y" " = 2" + gdb_test "p b" " = 4" +} -gdb_continue_to_breakpoint "break-here" ".* break-here .*" -gdb_test "p y" " = 4" -gdb_test "p b" " = 8" +with_test_prefix "call 2" { + gdb_continue_to_breakpoint "break-here" ".* break-here .*" + gdb_test "p y" " = 4" + gdb_test "p b" " = 8" +} -gdb_continue_to_breakpoint "break-here" ".* break-here .*" -gdb_test "p y" " = 10" -gdb_test "p b" " = 20" +with_test_prefix "call 3" { + gdb_continue_to_breakpoint "break-here" ".* break-here .*" + gdb_test "p y" " = 10" + gdb_test "p b" " = 20" +} -- 2.30.2