[binutils-gdb] [gdb/testsuite] Fix DUPLICATEs in gdb.threads/tls.exp

[Tom de Vries]

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

commit 0ad0e70c73205da6daeb27d2cc1eeae3e54bd3d0
Author: Tom de Vries <tdevries@suse.de>
Date:   Thu Oct 29 07:55:46 2020 +0100

    [gdb/testsuite] Fix DUPLICATEs in gdb.threads/tls.exp
    
    With test-case gdb.threads/tls.exp, we get these:
    ...
    DUPLICATE: gdb.threads/tls.exp: selected thread: 4
    DUPLICATE: gdb.threads/tls.exp: selected thread: 2
    DUPLICATE: gdb.threads/tls.exp: selected thread: 3
    ...
    
    Fix these using with_test_prefix.
    
    Tested on x86_64-linux.
    
    gdb/testsuite/ChangeLog:
    
    2020-10-29  Tom de Vries  <tdevries@suse.de>
    
            * gdb.threads/tls.exp: Fix DUPLICATEs.

Diff:
---
 gdb/testsuite/ChangeLog           | 4 ++++
 gdb/testsuite/gdb.threads/tls.exp | 9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ee8f729cbf4..24bc0d82c47 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2020-10-29  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.threads/tls.exp: Fix DUPLICATEs.
+
 2020-10-28  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.python/py-symbol.exp: Add KFAILs for -readnow.
diff --git a/gdb/testsuite/gdb.threads/tls.exp b/gdb/testsuite/gdb.threads/tls.exp
index 8147a6c1327..77916e758da 100644
--- a/gdb/testsuite/gdb.threads/tls.exp
+++ b/gdb/testsuite/gdb.threads/tls.exp
@@ -127,7 +127,9 @@ proc check_thread_stack {number spin_threads spin_threads_level} {
     upvar $spin_threads tarr
     upvar $spin_threads_level tarrl
 
-    select_thread $number
+    with_test_prefix "thread stack" {
+	select_thread $number
+    }
     send_gdb "where\n"
     gdb_expect {
 	-re ".*(\[0-9\]+)\[ \t\]+$hex in spin \\(vp=(0x\[0-9a-f\]+).*\r\n$gdb_prompt $" {
@@ -257,7 +259,10 @@ set thrs_in_spin 0
 foreach i [array names spin_threads] {
     if {$spin_threads($i) == 1} {
       incr thrs_in_spin
-      select_thread $i
+
+      with_test_prefix "spin_threads" {
+	select_thread $i
+      }
       set level $spin_threads_level($i)
       # We expect to be in sem_wait, but if the thread has not yet
       # been scheduled, we might be in sem_post still.  We could be at