From 158bf1b4aacf7f184facdc184dc9585994f041a6 Mon Sep 17 00:00:00 2001 From: Patrick Palka Date: Thu, 21 May 2015 18:53:03 -0400 Subject: [PATCH] Make sure test names are unique in gdb.base/gdbinit-history.exp Use with_test_prefix to avoid duplicating test names when calling the procedure test_gdbinit_history_setting multiple times. gdb/testsuite/ChangeLog: * gdb.base/gdbinit-history.exp (test_gdbinit_history_setting): Use with_test_prefix. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/gdbinit-history.exp | 16 +++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 49f56f45eb4..b8f514b528e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-05-22 Patrick Palka + + * gdb.base/gdbinit-history.exp (test_gdbinit_history_setting): + Use with_test_prefix. + 2015-05-21 Andrew Burgess * gdb.base/completion.exp: Add test for completion of layout diff --git a/gdb/testsuite/gdb.base/gdbinit-history.exp b/gdb/testsuite/gdb.base/gdbinit-history.exp index aba15b45158..8adfd68a78f 100644 --- a/gdb/testsuite/gdb.base/gdbinit-history.exp +++ b/gdb/testsuite/gdb.base/gdbinit-history.exp @@ -39,15 +39,17 @@ proc test_gdbinit_history_setting { home size } { set saved_internal_gdbflags $INTERNAL_GDBFLAGS set INTERNAL_GDBFLAGS [string map {"-nx" ""} $INTERNAL_GDBFLAGS] - gdb_exit - gdb_start + with_test_prefix "home=$home" { + gdb_exit + gdb_start - gdb_test "show history size" "The size of the command history is $size." + gdb_test "show history size" "The size of the command history is $size." - if { $size == "0" } { - gdb_test_no_output "show commands" - } elseif { $size != "1" } { - gdb_test "show commands" " . show history size\r\n . show commands" + if { $size == "0" } { + gdb_test_no_output "show commands" + } elseif { $size != "1" } { + gdb_test "show commands" " . show history size\r\n . show commands" + } } set INTERNAL_GDBFLAGS $saved_internal_gdbflags -- 2.30.2