From 417d2514ef183c2beacd932651c6684743130ab6 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Thu, 9 Jun 2022 13:34:57 +0100 Subject: [PATCH] gdb/testsuite: resolve duplicate test name in gnu_vector.exp While testing on AArch64 I spotted a duplicate test name in the gdb.base/gnu_vector.exp test. This commit adds a 'with_test_prefix' to resolve the duplicate. While I was in the area I updated a 'gdb_test_multiple' call to make use of $gdb_test_name. There should be no change in what is tested after this commit. --- gdb/testsuite/gdb.base/gnu_vector.exp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gdb/testsuite/gdb.base/gnu_vector.exp b/gdb/testsuite/gdb.base/gnu_vector.exp index b47be65cc1f..796d9e947e1 100644 --- a/gdb/testsuite/gdb.base/gnu_vector.exp +++ b/gdb/testsuite/gdb.base/gnu_vector.exp @@ -222,16 +222,18 @@ gdb_test "print add_structvecs(i2, (struct just_int2)\{2*i2\}, (struct two_int2) gdb_test "print add_singlevecs((char1) \{6\}, (int1) \{12\}, (double1) \{24\})" "= \\{42\\}" \ "call add_singlevecs" -# Test "finish" from vector-valued function. gdb_breakpoint "add_some_intvecs" -gdb_continue "add_some_intvecs" -set test "finish shows vector return value" -gdb_test_multiple "finish" $test { - -re "Value returned is .* = \\{10, 20, 48, 72\\}.*$gdb_prompt $" { - pass $test - } - -re "Value returned has type: .* Cannot determine contents.*$gdb_prompt $" { - kfail "gdb/8549" $test + +# Test "finish" from vector-valued function. +with_test_prefix "finish from vector function" { + gdb_continue "add_some_intvecs" + gdb_test_multiple "finish" "shows vector return value" { + -re "Value returned is .* = \\{10, 20, 48, 72\\}.*$gdb_prompt $" { + pass $gdb_test_name + } + -re "Value returned has type: .* Cannot determine contents.*$gdb_prompt $" { + kfail "gdb/8549" $gdb_test_name + } } } -- 2.30.2