From b4991d292edd84c16bd2050bd071198ceae764fe Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Tue, 12 May 2020 11:18:14 +0200 Subject: [PATCH] [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 * gdb.multi/multi-term-settings.exp: Use with_test_prefix. --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.multi/multi-term-settings.exp | 14 ++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ad4e5033880..73df28faf17 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2020-05-12 Tom de Vries + + * gdb.multi/multi-term-settings.exp: Use with_test_prefix. + 2020-05-12 Tom de Vries * gdb.ada/catch_ex.exp: Use with_test_prefix. diff --git a/gdb/testsuite/gdb.multi/multi-term-settings.exp b/gdb/testsuite/gdb.multi/multi-term-settings.exp index dafbb1e5f32..aa467e3b413 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"} -- 2.30.2