[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 --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e56cc16628d070e28cdf49d3391f8370d02d6c62..639bea20e731b69d7974168bbcc2be3148cd8524 100644 (file)
--- 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 fd3883b69282aae23a05d3d0417398ade638e6ce..1c550aaa2e37c17886eb44fbd94e5c2eb45dbb69 100644 (file)
--- 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.