From: Tom de Vries <tdevries@suse.de>
Date: Tue, 12 May 2020 09:05:44 +0000 (+0200)
Subject: [gdb/testsuite] Fix duplicate test-names in gdb.ada
X-Git-Tag: binutils-2_35~784
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dbb0ab10dd5b57c762d01dd8962b6e579359a2ca;p=thirdparty%2Fbinutils-gdb.git

[gdb/testsuite] Fix duplicate test-names in gdb.ada

In gdb.ada we have these duplicate test-names:
...
DUPLICATE: gdb.ada/catch_ex.exp: continuing to program completion
DUPLICATE: gdb.ada/mi_catch_ex.exp: breakpoint at main
DUPLICATE: gdb.ada/mi_catch_ex.exp: mi runto main
DUPLICATE: gdb.ada/mi_catch_ex_hand.exp: breakpoint at main
DUPLICATE: gdb.ada/mi_catch_ex_hand.exp: mi runto main
...

Fix these using with_test_prefix.

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

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/ChangeLog b/gdb/testsuite/ChangeLog
index ae72ce6dd73..ad4e5033880 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2020-05-12  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.fortran/complex.exp: Use with_test_prefix.
diff --git a/gdb/testsuite/gdb.ada/catch_ex.exp b/gdb/testsuite/gdb.ada/catch_ex.exp
index 5bdb63c8fc6..7bb1c06f544 100644
--- a/gdb/testsuite/gdb.ada/catch_ex.exp
+++ b/gdb/testsuite/gdb.ada/catch_ex.exp
@@ -162,9 +162,10 @@ gdb_test "continue" \
          "Continuing\.$eol$temp_catchpoint_msg$eol.*SPOT1" \
          "continuing to temporary catchpoint"
 
-gdb_test "continue" \
-         "Continuing\..*$inferior_exited_re.*" \
-         "continuing to program completion"
-
+with_test_prefix "temporary catchpoint" {
+    gdb_test "continue" \
+	"Continuing\..*$inferior_exited_re.*" \
+	"continuing to program completion"
+}
 
 
diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex.exp b/gdb/testsuite/gdb.ada/mi_catch_ex.exp
index 60a5f6f19ee..4b3e4f6f0b1 100644
--- a/gdb/testsuite/gdb.ada/mi_catch_ex.exp
+++ b/gdb/testsuite/gdb.ada/mi_catch_ex.exp
@@ -69,9 +69,11 @@ mi_gdb_load ${binfile}
 # 1. Try catching all exceptions.  #
 ####################################
 
-if ![mi_run_to_main] then {
-   fail "cannot run to main, testcase aborted"
-   return 0
+with_test_prefix "scenario 1" {
+    if ![mi_run_to_main] then {
+	fail "cannot run to main, testcase aborted"
+	return 0
+    }
 }
 
 mi_gdb_test "-catch-exception" \
@@ -125,9 +127,11 @@ continue_to_exception \
 #  - continue, we should see the unhandled Constrait_Error exception
 #  - continue, the program exits.
 
-if ![mi_run_to_main] then {
-   fail "cannot run to main, testcase aborted"
-   return 0
+with_test_prefix "scenario 2" {
+    if ![mi_run_to_main] then {
+	fail "cannot run to main, testcase aborted"
+	return 0
+    }
 }
 
 mi_gdb_test "-catch-exception -e Program_Error" \
diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp b/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
index 159b22173a0..59c8a100851 100644
--- a/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
+++ b/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
@@ -64,9 +64,11 @@ if [mi_gdb_start] {
 # 1. Try catching all exceptions handlers.  #
 #############################################
 
-if ![mi_run_to_main] then {
-   fail "cannot run to main, testcase aborted"
-   return 0
+with_test_prefix "scenario 1" {
+    if ![mi_run_to_main] then {
+	fail "cannot run to main, testcase aborted"
+	return 0
+    }
 }
 
 mi_gdb_test "-catch-handlers" \
@@ -114,9 +116,11 @@ continue_to_exception_handler \
 #  - continue, we should not stop at the Program_Error exception handler
 #    but exit instead.
 
-if ![mi_run_to_main] then {
-   fail "cannot run to main, testcase aborted"
-   return 0
+with_test_prefix "scenario 2" {
+    if ![mi_run_to_main] then {
+	fail "cannot run to main, testcase aborted"
+	return 0
+    }
 }
 
 mi_gdb_test "-catch-handlers -e Constraint_Error" \