[gdb/testsuite] Fix trailing-text-in-parentheses duplicates

Fix all trailing-text-in-parentheses duplicates exposed by previous patch.

Tested on x86_64-linux and aarch64-linux.

7 files changed, 60 insertions, 60 deletions

diff --git a/gdb/testsuite/gdb.fortran/multi-dim.exp b/gdb/testsuite/gdb.fortran/multi-dim.exp
index 3325e52..eda2d6a 100644
--- a/gdb/testsuite/gdb.fortran/multi-dim.exp
+++ b/gdb/testsuite/gdb.fortran/multi-dim.exp
@@ -41,19 +41,19 @@ gdb_test "print foo(2,3,4)" \
 
 gdb_test "print foo(0,0,0)" \
     "no such vector element" \
-    "print an invalid array index (0,0,0)"
+    "print an invalid array index @ 0,0,0"
 
 gdb_test "print foo(2,3,5)" \
     "no such vector element" \
-    "print an invalid array index (2,3,5)"
+    "print an invalid array index @ 2,3,5"
 
 gdb_test "print foo(2,4,4)" \
     "no such vector element" \
-    "print an invalid array index (2,4,4)"
+    "print an invalid array index @ 2,4,4"
 
 gdb_test "print foo(3,3,4)" \
     "no such vector element" \
-    "print an invalid array index (3,3,4)"
+    "print an invalid array index @ 3,3,4"
 
 gdb_test "print foo" \
     { = \(\(\(10, 10\) \(10, 10\) \(10, 10\)\) \(\(10, 10\) \(10, 10\) \(10, 10\)\) \(\(10, 10\) \(10, 10\) \(10, 10\)\) \(\(10, 10\) \(10, 10\) \(10, 20\)\)\)} \
diff --git a/gdb/testsuite/gdb.fortran/size.exp b/gdb/testsuite/gdb.fortran/size.exp
index 93fb444..925aeed 100644
--- a/gdb/testsuite/gdb.fortran/size.exp
+++ b/gdb/testsuite/gdb.fortran/size.exp
@@ -95,7 +95,7 @@ gdb_assert {$found_dealloc_breakpoint} "ran all compiled in tests"
 
 foreach var {array_1d_p array_2d_p allocatable_array_1d \
 		 allocatable_array_2d} {
-    gdb_test_multiple "p size ($var, 3)" "p size ($var, 3)" {
+    gdb_test_multiple "p size ($var, 3)" "" {
 	-re -wrap "DIM argument to SIZE must be between 1 and \[1-2\]" {
 	    pass $gdb_test_name
 	}
@@ -129,7 +129,7 @@ gdb_continue_to_breakpoint "Final Breakpoint"
 
 foreach var {array_1d_p array_2d_p allocatable_array_1d \
 		 allocatable_array_2d} {
-    gdb_test_multiple "p size ($var)" "p size ($var)" {
+    gdb_test_multiple "p size ($var)" "" {
 	-re -wrap "SIZE can only be used on allocated/associated arrays" {
 	    pass $gdb_test_name
 	}
diff --git a/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp b/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp
index 5e6c3f8..01717b0 100644
--- a/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp
+++ b/gdb/testsuite/gdb.fortran/vla-alloc-assoc.exp
@@ -32,32 +32,32 @@ if ![fortran_runto_main] {
 gdb_breakpoint [gdb_get_line_number "vla1-allocated"]
 gdb_continue_to_breakpoint "vla1-allocated"
 gdb_test "print l" " = \\.TRUE\\." \
-  "print vla1 allocation status (allocated)"
+  "print vla1 allocation status, allocated"
 
 gdb_breakpoint [gdb_get_line_number "vla2-allocated"]
 gdb_continue_to_breakpoint "vla2-allocated"
 gdb_test "print l" " = \\.TRUE\\." \
-  "print vla2 allocation status (allocated)"
+  "print vla2 allocation status, allocated"
 
 gdb_breakpoint [gdb_get_line_number "pvla-associated"]
 gdb_continue_to_breakpoint "pvla-associated"
 gdb_test "print l" " = \\.TRUE\\." \
-  "print pvla associated status (associated)"
+  "print pvla associated status, associated"
 
 gdb_breakpoint [gdb_get_line_number "pvla-re-associated"]
 gdb_continue_to_breakpoint "pvla-re-associated"
 gdb_test "print l" " = \\.TRUE\\." \
-  "print pvla associated status (re-associated)"
+  "print pvla associated status, re-associated"
 
 gdb_breakpoint [gdb_get_line_number "pvla-deassociated"]
 gdb_continue_to_breakpoint "pvla-deassociated"
 gdb_test "print l" " = \\.FALSE\\." \
-  "print pvla allocation status (deassociated)"
+  "print pvla allocation status, deassociated"
 
 gdb_breakpoint [gdb_get_line_number "vla1-deallocated"]
 gdb_continue_to_breakpoint "vla1-deallocated"
 gdb_test "print l" " = \\.FALSE\\." \
-  "print vla1 allocation status (deallocated)"
+  "print vla1 allocation status, deallocated"
 gdb_test "print vla1" " = <not allocated>" \
   "print deallocated vla1"
 
diff --git a/gdb/testsuite/gdb.fortran/vla-datatypes.exp b/gdb/testsuite/gdb.fortran/vla-datatypes.exp
index ed3b0f1..8227f23 100644
--- a/gdb/testsuite/gdb.fortran/vla-datatypes.exp
+++ b/gdb/testsuite/gdb.fortran/vla-datatypes.exp
@@ -74,12 +74,12 @@ gdb_test "print charactervla(5,5,5)" " = 'K'" \
 
 gdb_breakpoint [gdb_get_line_number "vlas-modified"]
 gdb_continue_to_breakpoint "vlas-modified"
-gdb_test "print intvla(5,5,5)" " = 42" "print intvla(5,5,5) (2nd)"
+gdb_test "print intvla(5,5,5)" " = 42" "print intvla(5,5,5), 2nd"
 gdb_test "print realvla(5,5,5)" " = 4.13\\d+" \
-  "print realvla(5,5,5) (2nd)"
+  "print realvla(5,5,5), 2nd"
 gdb_test "print complexvla(5,5,5)" " = \\\(-3,2\\\)" \
-  "print complexvla(5,5,5) (2nd)"
+  "print complexvla(5,5,5), 2nd"
 gdb_test "print logicalvla(5,5,5)" " = \\.FALSE\\." \
-  "print logicalvla(5,5,5) (2nd)"
+  "print logicalvla(5,5,5), 2nd"
 gdb_test "print charactervla(5,5,5)" " = 'X'" \
-  "print charactervla(5,5,5) (2nd)"
+  "print charactervla(5,5,5), 2nd"
diff --git a/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp b/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp
index cf3fcfe..78b711b 100644
--- a/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp
+++ b/gdb/testsuite/gdb.fortran/vla-ptype-sub.exp
@@ -33,7 +33,7 @@ set real [fortran_real4]
 
 # Pass fixed array to function and handle them as vla in function.
 gdb_breakpoint [gdb_get_line_number "not-filled"]
-gdb_continue_to_breakpoint "not-filled (1st)"
+gdb_continue_to_breakpoint "not-filled, 1st"
 gdb_test "ptype array1" "type = $int \\\(42,42\\\)" \
   "ptype array1 (passed fixed)"
 gdb_test "ptype array2" "type = $real \\\(42,42,42\\\)" \
@@ -44,15 +44,15 @@ gdb_test "ptype array2(13, 11, 5)" "type = $real" \
   "ptype array2(13, 11, 5) (passed fixed)"
 
 # Pass sub arrays to function and handle them as vla in function.
-gdb_continue_to_breakpoint "not-filled (2nd)"
+gdb_continue_to_breakpoint "not-filled, 2nd"
 gdb_test "ptype array1" "type = $int \\\(6,6\\\)" \
-  "ptype array1 (passed sub-array)"
+  "ptype array1, passed sub-array"
 gdb_test "ptype array2" "type = $real \\\(6,6,6\\\)" \
-  "ptype array2 (passed sub-array)"
+  "ptype array2, passed sub-array"
 gdb_test "ptype array1(3, 3)" "type = $int" \
-  "ptype array1(3, 3) (passed sub-array)"
+  "ptype array1(3, 3), passed sub-array"
 gdb_test "ptype array2(4, 4, 4)" "type = $real" \
-  "ptype array2(4, 4, 4) (passed sub-array)"
+  "ptype array2(4, 4, 4), passed sub-array"
 
 # Check ptype outside of bounds.  This should not crash GDB.
 gdb_test "ptype array1(100, 100)" "no such vector element" \
@@ -61,15 +61,15 @@ gdb_test "ptype array2(100, 100, 100)" "no such vector element" \
   "ptype array2(100, 100, 100) subarray do not crash (passed sub-array)"
 
 # Pass vla to function.
-gdb_continue_to_breakpoint "not-filled (3rd)"
+gdb_continue_to_breakpoint "not-filled, 3rd"
 gdb_test "ptype array1" "type = $int \\\(20,20\\\)" \
-  "ptype array1 (passed vla)"
+  "ptype array1, passed vla"
 gdb_test "ptype array2" "type = $real \\\(10,10,10\\\)" \
-  "ptype array2 (passed vla)"
+  "ptype array2, passed vla"
 gdb_test "ptype array1(3, 3)" "type = $int" \
-  "ptype array1(3, 3) (passed vla)"
+  "ptype array1(3, 3), passed vla"
 gdb_test "ptype array2(4, 4, 4)" "type = $real" \
-  "ptype array2(4, 4, 4) (passed vla)"
+  "ptype array2(4, 4, 4), passed vla"
 
 # Check ptype outside of bounds.  This should not crash GDB.
 gdb_test "ptype array1(100, 100)" "no such vector element" \
@@ -83,11 +83,11 @@ gdb_breakpoint [gdb_get_line_number "end-of-bar"]
 gdb_continue_to_breakpoint "end-of-bar"
 gdb_test "ptype array1" \
   "type = (PTR TO -> \\( )?$int \\(\\*\\)\\)?" \
-  "ptype array1 (arbitrary length)"
+  "ptype array1, arbitrary length"
 gdb_test "ptype array2" \
   "type = (PTR TO -> \\( )?$int \\(4:9,10:\\*\\)\\)?" \
-  "ptype array2 (arbitrary length)"
+  "ptype array2, arbitrary length"
 gdb_test "ptype array1(100)" "type = $int" \
-  "ptype array1(100) (arbitrary length)"
+  "ptype array1(100), arbitrary length"
 gdb_test "ptype array2(4,100)" "type = $int" \
-  "ptype array2(4,100) (arbitrary length)"
+  "ptype array2(4,100), arbitrary length"
diff --git a/gdb/testsuite/gdb.fortran/vla-value-sub.exp b/gdb/testsuite/gdb.fortran/vla-value-sub.exp
index cbeec34..23ee539 100644
--- a/gdb/testsuite/gdb.fortran/vla-value-sub.exp
+++ b/gdb/testsuite/gdb.fortran/vla-value-sub.exp
@@ -45,7 +45,7 @@ gdb_test "print array1(1, 1)" " = 30" \
   "print array1(1, 1) after filled in foo (passed fixed array)"
 
 gdb_breakpoint [gdb_get_line_number "array2-almost-filled"]
-gdb_continue_to_breakpoint "array2-almost-filled (1st)"
+gdb_continue_to_breakpoint "array2-almost-filled, 1st"
 # array2 size is 296352 bytes.
 gdb_test_no_output "set max-value-size 1024*1024"
 gdb_test "print array2" " = \\( *\\( *\\( *30, *3, *3,\[()3, .\]*\\)" \
@@ -57,40 +57,40 @@ gdb_test "print array2" " = \\( *\\( *\\( *30, *20, *3,\[()3, .\]*\\)" \
 
 
 # Try to access values from a fixed sub-array handled as VLA in subroutine.
-gdb_continue_to_breakpoint "not-filled (2nd)"
+gdb_continue_to_breakpoint "not-filled, 2nd"
 gdb_test "print array1" " = \\(\[()5, .\]*\\)" \
-  "print passed array1 in foo (passed sub-array)"
+  "print passed array1 in foo, passed sub-array"
 
-gdb_continue_to_breakpoint "array1-filled (2nd)"
+gdb_continue_to_breakpoint "array1-filled, 2nd"
 gdb_test "print array1(5, 5)" " = 5" \
-  "print array1(5, 5) after filled in foo (passed sub-array)"
+  "print array1(5, 5) after filled in foo, passed sub-array"
 gdb_test "print array1(1, 1)" " = 30" \
-  "print array1(1, 1) after filled in foo (passed sub-array)"
+  "print array1(1, 1) after filled in foo, passed sub-array"
 
-gdb_continue_to_breakpoint "array2-almost-filled (2nd)"
+gdb_continue_to_breakpoint "array2-almost-filled, 2nd"
 gdb_test "print array2" " = \\( *\\( *\\( *30, *3, *3,\[()3, .\]*\\)" \
-  "print array2 in foo after it was filled (passed sub-array)"
+  "print array2 in foo after it was filled, passed sub-array"
 gdb_test "print array2(2,1,1)=20" " = 20" \
-  "set array(2,2,2) to 20 in subroutine (passed sub-array)"
+  "set array(2,2,2) to 20 in subroutine, passed sub-array"
 gdb_test "print array2" " = \\( *\\( *\\( *30, *20, *3,\[()3, .\]*\\)" \
-  "print array2 in foo after it was mofified in debugger (passed sub-array)"
+  "print array2 in foo after it was mofified in debugger, passed sub-array"
 
 
 # Try to access values from a VLA passed to subroutine.
-gdb_continue_to_breakpoint "not-filled (3rd)"
+gdb_continue_to_breakpoint "not-filled, 3rd"
 gdb_test "print array1" " = \\(\[()42, .\]*\\)" \
-  "print passed array1 in foo (passed vla)"
+  "print passed array1 in foo, passed vla"
 
-gdb_continue_to_breakpoint "array1-filled (3rd)"
+gdb_continue_to_breakpoint "array1-filled, 3rd"
 gdb_test "print array1(5, 5)" " = 5" \
-  "print array1(5, 5) after filled in foo (passed vla)"
+  "print array1(5, 5) after filled in foo, passed vla"
 gdb_test "print array1(1, 1)" " = 30" \
-  "print array1(1, 1) after filled in foo (passed vla)"
+  "print array1(1, 1) after filled in foo, passed vla"
 
-gdb_continue_to_breakpoint "array2-almost-filled (3rd)"
+gdb_continue_to_breakpoint "array2-almost-filled, 3rd"
 gdb_test "print array2" " = \\( *\\( *\\( *30, *3, *3,\[()3, .\]*\\)" \
-  "print array2 in foo after it was filled (passed vla)"
+  "print array2 in foo after it was filled, passed vla"
 gdb_test "print array2(2,1,1)=20" " = 20" \
-  "set array(2,2,2) to 20 in subroutine (passed vla)"
+  "set array(2,2,2) to 20 in subroutine, passed vla"
 gdb_test "print array2" " = \\( *\\( *\\( *30, *20, *3,\[()3, .\]*\\)" \
-  "print array2 in foo after it was mofified in debugger (passed vla)"
+  "print array2 in foo after it was mofified in debugger, passed vla"
diff --git a/gdb/testsuite/gdb.fortran/vla-value.exp b/gdb/testsuite/gdb.fortran/vla-value.exp
index 587a491..a3f50d1 100644
--- a/gdb/testsuite/gdb.fortran/vla-value.exp
+++ b/gdb/testsuite/gdb.fortran/vla-value.exp
@@ -39,10 +39,10 @@ gdb_test "print &vla1" \
   " = \\\(PTR TO -> \\\( $real, allocatable \\\(:,:,:\\\) \\\)\\\) $hex" \
   "print non-allocated &vla1"
 gdb_test "print vla1(1,1,1)" "no such vector element \\\(vector not allocated\\\)" \
-  "print member in non-allocated vla1 (1)"
+  "print member in non-allocated vla1, 1"
 gdb_test "print vla1(101,202,303)" \
   "no such vector element \\\(vector not allocated\\\)" \
-  "print member in non-allocated vla1 (2)"
+  "print member in non-allocated vla1, 2"
 gdb_test "print vla1(5,2,18)=1" "no such vector element \\\(vector not allocated\\\)" \
   "set member in non-allocated vla1"
 
@@ -68,11 +68,11 @@ gdb_test "print vla1(9, 9, 9) = 999" " = 999" \
 gdb_breakpoint [gdb_get_line_number "vla1-filled"]
 gdb_continue_to_breakpoint "vla1-filled"
 gdb_test "print vla1(3, 6, 9)" " = 42" \
-  "print allocated vla1(3,6,9) after specific assignment (filled)"
+  "print allocated vla1(3,6,9) after specific assignment, filled"
 gdb_test "print vla1(1, 3, 8)" " = 1001" \
-  "print allocated vla1(1,3,8) after specific assignment (filled)"
+  "print allocated vla1(1,3,8) after specific assignment, filled"
 gdb_test "print vla1(9, 9, 9)" " = 999" \
-  "print allocated vla1(9,9,9) after assignment in debugger (filled)"
+  "print allocated vla1(9,9,9) after assignment in debugger, filled"
 
 # Try to access values in undefined pointer to VLA (dangling)
 gdb_test "print pvla" " = <not associated>" "print undefined pvla"
@@ -120,11 +120,11 @@ gdb_test "print pvla" " = <not associated>" \
 gdb_breakpoint [gdb_get_line_number "vla1-deallocated"]
 gdb_continue_to_breakpoint "vla1-deallocated"
 gdb_test "print vla1(3, 6, 9)" "no such vector element \\\(vector not allocated\\\)" \
-  "print allocated vla1(3,6,9) after specific assignment (deallocated)"
+  "print allocated vla1(3,6,9) after specific assignment, deallocated"
 gdb_test "print vla1(1, 3, 8)" "no such vector element \\\(vector not allocated\\\)" \
-  "print allocated vla1(1,3,8) after specific assignment (deallocated)"
+  "print allocated vla1(1,3,8) after specific assignment, deallocated"
 gdb_test "print vla1(9, 9, 9)" "no such vector element \\\(vector not allocated\\\)" \
-  "print allocated vla1(9,9,9) after assignment in debugger (deallocated)"
+  "print allocated vla1(9,9,9) after assignment in debugger, deallocated"
 
 
 # Try to assign VLA to user variable
@@ -147,7 +147,7 @@ gdb_test "print \$myvar" \
   " = \\( *\\( *\\( *1311, *1311, *1311,\[()1311, .\]*\\)" \
   "print \$myvar set to vla1"
 
-gdb_test "next" "\\d+.*vla1\\(1, 3, 8\\) = 1001" "next (2)"
+gdb_test "next" "\\d+.*vla1\\(1, 3, 8\\) = 1001" "next, 2"
 gdb_test "print \$myvar(3,6,9)" " = 1311"
 
 gdb_breakpoint [gdb_get_line_number "pvla-associated"]