RE: [PATCH 1/4] testsuite, gdb.btrace: make test names unique

["Metzger, Markus T via Gdb-patches" <gdb-patches@sourceware.org>]

Hello Simon,

Thanks for your review.

> > @@ -60,13 +60,13 @@ proc gdb_cont_to { threads cmd line nthreads } {
> >      # the prompt precedes any further output except some errors.
> >      gdb_test_multiple "$full_cmd &" "$full_cmd: prompt" {
> >          -re "$gdb_prompt " {
> > -            pass "$full_cmd: prompt"
> > +            pass "$full_cmd ($message): prompt"
> >          }
> >      }
> 
> It would be preferable to use
> 
>   gdb_test_multiple "$full_cmd &" "$full_cmd ($message): prompt" {
> 
> and $gdb_test_name inside the "-re" clause, to make sure the test name
> is the same regardless of the outcome.
> 
> And just a nit, I would prefer if the message was used for a
> "with_test_prefix" for the whole proc, instead of putting the context
> in parenthesis.

I changed gdb_cont_to to [1].  The rest of the patch already added
with_test_prefix to most users, which left only two for which I added them.

Thanks,
Markus.

[1]
---
diff --git a/gdb/testsuite/gdb.btrace/non-stop.exp b/gdb/testsuite/gdb.btrace/non-stop.exp
index 1637fab888a..0a9b753eca4 100644
--- a/gdb/testsuite/gdb.btrace/non-stop.exp
+++ b/gdb/testsuite/gdb.btrace/non-stop.exp
@@ -60,17 +60,15 @@ proc gdb_cont_to { threads cmd line nthreads } {
     # the prompt precedes any further output except some errors.
     gdb_test_multiple "$full_cmd &" "$full_cmd: prompt" {
         -re "$gdb_prompt " {
-            pass "$full_cmd: prompt"
+            pass $gdb_test_name
         }
     }
 
     # now check for the expected line - one per thread.
     for {set i 0} {$i < $nthreads} {incr i} {
-        set test "$full_cmd: thread $i"
-
-        gdb_test_multiple "" $test {
+        gdb_test_multiple "" "$full_cmd: thread $i" {
             -re "$line\[^\\\r\\\n\]*\r\n" {
-                pass $test
+                pass $gdb_test_name
             }
         }
     }
@@ -96,9 +94,13 @@ proc gdb_cont_to_no_history { threads cmd nthreads } {
 }
 
 # trace the code between the two breakpoints
-gdb_cont_to_bp_line "$srcfile:$bp_1" all 2
-gdb_test_no_output "record btrace"
-gdb_cont_to_bp_line "$srcfile:$bp_2" all 2
+with_test_prefix "prepare" {
+    gdb_cont_to_bp_line "$srcfile:$bp_1" all 2
+}
+with_test_prefix "record" {
+    gdb_test_no_output "record btrace"
+    gdb_cont_to_bp_line "$srcfile:$bp_2" all 2
+}
 
 # we don't need those breakpoints any longer.
 # they will only disturb our stepping.

Intel Deutschland GmbH
Registered Address: Am Campeon 10-12, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de
Managing Directors: Christin Eisenschmid, Gary Kershaw
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928