aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2020-05-12 11:18:14 +0200
committerTom de Vries <tdevries@suse.de>2020-05-12 11:18:14 +0200
commitb4991d292edd84c16bd2050bd071198ceae764fe (patch)
treeb1f3986769862f3d2dc3791568a9e9e028a679d8
parentdbb0ab10dd5b57c762d01dd8962b6e579359a2ca (diff)
downloadgdb-b4991d292edd84c16bd2050bd071198ceae764fe.zip
gdb-b4991d292edd84c16bd2050bd071198ceae764fe.tar.gz
gdb-b4991d292edd84c16bd2050bd071198ceae764fe.tar.bz2
[gdb/testsuite] Fix duplicate test-names in gdb.multi
In gdb.multi we have: ... DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=run: inf2_how=run: info inferiors DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=run: inf2_how=attach: info inferiors DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=run: inf2_how=tty: info inferiors DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=attach: inf2_how=run: info inferiors DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=attach: inf2_how=attach: attach DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=attach: inf2_how=attach: info inferiors DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=attach: inf2_how=tty: info inferiors DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=tty: inf2_how=run: info inferiors DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=tty: inf2_how=attach: info inferiors DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=tty: inf2_how=tty: tty TTY DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=tty: inf2_how=tty: info inferiors ... Fix these using with_test_prefix. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2020-05-12 Tom de Vries <tdevries@suse.de> * gdb.multi/multi-term-settings.exp: Use with_test_prefix.
-rw-r--r--gdb/testsuite/ChangeLog4
-rw-r--r--gdb/testsuite/gdb.multi/multi-term-settings.exp14
2 files changed, 14 insertions, 4 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ad4e503..73df28f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,9 @@
2020-05-12 Tom de Vries <tdevries@suse.de>
+ * gdb.multi/multi-term-settings.exp: Use with_test_prefix.
+
+2020-05-12 Tom de Vries <tdevries@suse.de>
+
* gdb.ada/catch_ex.exp: Use with_test_prefix.
* gdb.ada/mi_catch_ex.exp: Same.
* gdb.ada/mi_catch_ex_hand.exp: Same.
diff --git a/gdb/testsuite/gdb.multi/multi-term-settings.exp b/gdb/testsuite/gdb.multi/multi-term-settings.exp
index dafbb1e..aa467e3 100644
--- a/gdb/testsuite/gdb.multi/multi-term-settings.exp
+++ b/gdb/testsuite/gdb.multi/multi-term-settings.exp
@@ -125,7 +125,9 @@ proc coretest {inf1_how inf2_how} {
clean_restart $binfile
- set inf1_spawn_id [create_inferior 1 $inf1_how]
+ with_test_prefix "inf1" {
+ set inf1_spawn_id [create_inferior 1 $inf1_how]
+ }
set num 2
gdb_test "add-inferior" "Added inferior $num.*" \
@@ -134,7 +136,9 @@ proc coretest {inf1_how inf2_how} {
"switch to inferior $num"
gdb_file_cmd ${binfile}
- set inf2_spawn_id [create_inferior 2 $inf2_how]
+ with_test_prefix "inf2" {
+ set inf2_spawn_id [create_inferior 2 $inf2_how]
+ }
gdb_test_no_output "set schedule-multiple on"
@@ -218,8 +222,10 @@ proc coretest {inf1_how inf2_how} {
}
# Useful for debugging in case the Ctrl-C above fails.
- gdb_test "info inferiors"
- gdb_test "info threads"
+ with_test_prefix "final" {
+ gdb_test "info inferiors"
+ gdb_test "info threads"
+ }
}
set how_modes {"run" "attach" "tty"}