[binutils-gdb] Make sure test names are unique in gdb.base/gdbinit-history.exp

[Patrick Palka <ppalka at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=158bf1b4aacf7f184facdc184dc9585994f041a6

commit 158bf1b4aacf7f184facdc184dc9585994f041a6
Author: Patrick Palka <patrick@parcs.ath.cx>
Date:   Thu May 21 18:53:03 2015 -0400

    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.

Diff:
---
 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 49f56f4..b8f514b 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-22  Patrick Palka  <patrick@parcs.ath.cx>
+
+	* gdb.base/gdbinit-history.exp (test_gdbinit_history_setting):
+	Use with_test_prefix.
+
 2015-05-21  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* 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 aba15b4..8adfd68 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