[binutils-gdb] [gdb/testsuite] Make gdb_test message more informative in multi-term-settings.exp

[Tom de Vries <vries at sourceware dot org>]

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

commit 395fad095c9cbc5a8b10557443da981cc3f61885
Author: Tom de Vries <tdevries@suse.de>
Date:   Thu Aug 22 16:54:59 2019 +0200

    [gdb/testsuite] Make gdb_test message more informative in multi-term-settings.exp
    
    This racy fail message, reported in PR24929:
    ...
    FAIL: gdb.multi/multi-term-settings.exp: inf1_how=attach: inf2_how=attach: \
      stop with control-c
    ...
    does not make clear which gdb_test fails here:
    ...
        if {$expect_ttou} {
           gdb_test "" "Quit" "stop with control-c"
        } else {
           gdb_test "" "received signal SIGINT.*" "stop with control-c"
        }
    ...
    
    Fix this by making the gdb_test message argument more informative.
    
    Tested on x86_64-linux.
    
    gdb/testsuite/ChangeLog:
    
    2019-08-22  Tom de Vries  <tdevries@suse.de>
    
    	* gdb.multi/multi-term-settings.exp (coretest): Make gdb_test messages
    	more informative.

Diff:
---
 gdb/testsuite/ChangeLog                         | 5 +++++
 gdb/testsuite/gdb.multi/multi-term-settings.exp | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e56cc16..639bea2 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-08-22  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.multi/multi-term-settings.exp (coretest): Make gdb_test messages
+	more informative.
+
 2019-08-21  Pedro Alves  <palves@redhat.com>
 
 	* gdb.base/with.exp: Test "with" with no arguments.
diff --git a/gdb/testsuite/gdb.multi/multi-term-settings.exp b/gdb/testsuite/gdb.multi/multi-term-settings.exp
index fd3883b..1c550aa 100644
--- a/gdb/testsuite/gdb.multi/multi-term-settings.exp
+++ b/gdb/testsuite/gdb.multi/multi-term-settings.exp
@@ -212,9 +212,9 @@ proc coretest {inf1_how inf2_how} {
 
     send_gdb "\003"
     if {$expect_ttou} {
-	gdb_test "" "Quit" "stop with control-c"
+	gdb_test "" "Quit" "stop with control-c (Quit)"
     } else {
-	gdb_test "" "received signal SIGINT.*" "stop with control-c"
+	gdb_test "" "received signal SIGINT.*" "stop with control-c (SIGINT)"
     }
 
     # Useful for debugging in case the Ctrl-C above fails.