[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.

4 files changed, 30 insertions, 30 deletions

diff --git a/gdb/testsuite/gdb.guile/scm-frame.exp b/gdb/testsuite/gdb.guile/scm-frame.exp
index 34c9f8c..bd54e63 100644
--- a/gdb/testsuite/gdb.guile/scm-frame.exp
+++ b/gdb/testsuite/gdb.guile/scm-frame.exp
@@ -91,9 +91,9 @@ gdb_test "guile (print (eq? bframe (newest-frame)))" \
     #t "newest frame -vs- newest frame"
 
 gdb_test "guile (print (eq? f0 f1))" \
-    "#f" "test equality comparison (false)"
+    "#f" "test equality comparison, false"
 gdb_test "guile (print (eq? f0 f0))" \
-    "#t" "test equality comparison (true)"
+    "#t" "test equality comparison, true"
 gdb_test "guile (print (frame-valid? f0))" \
     "#t" "test frame-valid?"
 gdb_test "guile (print (frame-name f0))" \
diff --git a/gdb/testsuite/gdb.guile/scm-parameter.exp b/gdb/testsuite/gdb.guile/scm-parameter.exp
index 20c601e..d10e9d2 100644
--- a/gdb/testsuite/gdb.guile/scm-parameter.exp
+++ b/gdb/testsuite/gdb.guile/scm-parameter.exp
@@ -62,11 +62,11 @@ gdb_test_multiline "Simple gdb boolean parameter" \
     "end"
 
 with_test_prefix "test-param" {
-    gdb_test "guile (print (parameter-value test-param))" "= #t" "parameter value (true)"
+    gdb_test "guile (print (parameter-value test-param))" "= #t" "parameter value, true"
     gdb_test "show print test-param" "The state of the Test Parameter is on." "show parameter on"
     gdb_test_no_output "set print test-param off"
     gdb_test "show print test-param" "The state of the Test Parameter is off." "show parameter off"
-    gdb_test "guile (print (parameter-value test-param))" "= #f" "parameter value (false)"
+    gdb_test "guile (print (parameter-value test-param))" "= #f" "parameter value, false"
     gdb_test "help show print test-param" "Show the state of the boolean test-param.*" "show help"
     gdb_test "help set print test-param" "Set the state of the boolean test-param.*" "set help"
     gdb_test "help set print" "set print test-param -- Set the state of the boolean test-param.*" "general help"
@@ -94,11 +94,11 @@ gdb_test_multiline "enum gdb parameter" \
     "end"
 
 with_test_prefix "test-enum-param" {
-    gdb_test "guile (print (parameter-value test-enum-param))" "one" "enum parameter value (one)"
+    gdb_test "guile (print (parameter-value test-enum-param))" "one" "enum parameter value, one"
     gdb_test "show print test-enum-param" "The state of the enum is one." "show initial value"
     gdb_test_no_output "set print test-enum-param two"
     gdb_test "show print test-enum-param" "The state of the enum is two." "show new value"
-    gdb_test "guile (print (parameter-value test-enum-param))" "two" "enum parameter value (two)"
+    gdb_test "guile (print (parameter-value test-enum-param))" "two" "enum parameter value, two"
     gdb_test "set print test-enum-param three" "Undefined item: \"three\".*" "set invalid enum parameter" 
 }
 
@@ -241,14 +241,14 @@ foreach_with_prefix kind {
 
     with_test_prefix "test-$kind-param" {
 	gdb_test "guile (print (parameter-value test-$kind-param))" \
-	    3 "$kind parameter value (3)"
+	    3 "$kind parameter value, 3"
 	gdb_test "show print test-$kind-param" \
 	    "The state of $kind is 3." "show initial value"
 	gdb_test_no_output "set print test-$kind-param 2"
 	gdb_test "show print test-$kind-param" \
 	    "The state of $kind is 2." "show new value"
 	gdb_test "guile (print (parameter-value test-$kind-param))" \
-	    2 "$kind parameter value (2)"
+	    2 "$kind parameter value, 2"
 	scm_param_test_maybe_no_output \
 	    "guile (set-parameter-value! test-$kind-param #:unlimited)" \
 	    $param_set_unlimited
@@ -257,18 +257,18 @@ foreach_with_prefix kind {
 	    "show unlimited value"
 	gdb_test_no_output "guile (set-parameter-value! test-$kind-param 1)"
 	gdb_test "guile (print (parameter-value test-$kind-param))" \
-	    1 "$kind parameter value (1)"
+	    1 "$kind parameter value, 1"
 	gdb_test_no_output "guile (set-parameter-value! test-$kind-param 0)"
 	gdb_test "guile (print (parameter-value test-$kind-param))" \
-	    $param_get_zero "$kind parameter value (0)"
+	    $param_get_zero "$kind parameter value, 0"
 	scm_param_test_maybe_no_output "set print test-$kind-param -1" \
 	    $param_set_minus_one
 	gdb_test "guile (print (parameter-value test-$kind-param))" \
-	    $param_get_minus_one "$kind parameter value (-1)"
+	    $param_get_minus_one "$kind parameter value, -1"
 	scm_param_test_maybe_no_output "set print test-$kind-param -2" \
 	    $param_set_minus_two
 	gdb_test "guile (print (parameter-value test-$kind-param))" \
-	    $param_get_minus_two "$kind parameter value (-2)"
+	    $param_get_minus_two "$kind parameter value, -2"
     }
 }
 
@@ -378,11 +378,11 @@ gdb_test_multiline "previously ambiguously named boolean parameter" \
 gdb_test_no_output "guile (register-parameter! prev-ambig)"
 
 with_test_prefix "previously-ambiguous" {
-    gdb_test "guile (print (parameter-value prev-ambig))" "= #f" "parameter value (false)"
+    gdb_test "guile (print (parameter-value prev-ambig))" "= #f" "parameter value, false"
     gdb_test "show print s" "Command is not documented is off." "show parameter off"
     gdb_test_no_output "set print s on"
     gdb_test "show print s" "Command is not documented is on." "show parameter on"
-    gdb_test "guile (print (parameter-value prev-ambig))" "= #t" "parameter value (true)"
+    gdb_test "guile (print (parameter-value prev-ambig))" "= #t" "parameter value, true"
     gdb_test "help show print s" "This command is not documented." "show help"
     gdb_test "help set print s" "This command is not documented." "set help"
     gdb_test "help set print" "set print s -- This command is not documented.*" "general help"
diff --git a/gdb/testsuite/gdb.guile/scm-symbol.exp b/gdb/testsuite/gdb.guile/scm-symbol.exp
index 0b85848..ad22a8b 100644
--- a/gdb/testsuite/gdb.guile/scm-symbol.exp
+++ b/gdb/testsuite/gdb.guile/scm-symbol.exp
@@ -37,9 +37,9 @@ gdb_install_guile_module
 gdb_scm_test_silent_cmd "guile (define main-func (lookup-global-symbol \"main\"))" \
     "lookup main"
 gdb_test "guile (print (symbol-function? main-func))" \
-    "= #t" "test (symbol-function? main)"
+    "= #t" "test, symbol-function? main"
 gdb_test "guile (print (lookup-global-symbol \"junk\"))" \
-    "= #f" "test (lookup-global-symbol junk)"
+    "= #f" "test, lookup-global-symbol junk"
 
 gdb_test "guile (print (symbol-value main-func))" \
     "= {int \\(int, char \[*\]\[*\]\\)} $hex \\<main\\>" "print value of main"
diff --git a/gdb/testsuite/gdb.guile/scm-type.exp b/gdb/testsuite/gdb.guile/scm-type.exp
index 71fbe5b..3a4f2d0 100644
--- a/gdb/testsuite/gdb.guile/scm-type.exp
+++ b/gdb/testsuite/gdb.guile/scm-type.exp
@@ -70,7 +70,7 @@ proc test_fields {lang} {
 
 	if {$lang == "c++"} {
 	    # Test usage with a class.
-	    gdb_scm_test_silent_cmd "print c" "print value (c)"
+	    gdb_scm_test_silent_cmd "print c" "print value, c"
 	    gdb_scm_test_silent_cmd "guile (define c (history-ref 0))" \
 		"get value (c) from history"
 	    gdb_scm_test_silent_cmd "guile (define fields (type-fields (value-type c)))" \
@@ -84,7 +84,7 @@ proc test_fields {lang} {
 	}
 
 	# Test normal fields usage in structs.
-	gdb_scm_test_silent_cmd "print st" "print value (st)"
+	gdb_scm_test_silent_cmd "print st" "print value, st"
 	gdb_scm_test_silent_cmd "guile (define st (history-ref 0))" \
 	    "get value (st) from history"
 	gdb_scm_test_silent_cmd "guile (define st-type (value-type st))" \
@@ -120,7 +120,7 @@ proc test_fields {lang} {
 	    "check field iterator on bad type"
 
 	# Test type-array.
-	gdb_scm_test_silent_cmd "print ar" "print value (ar)"
+	gdb_scm_test_silent_cmd "print ar" "print value, ar"
 	gdb_scm_test_silent_cmd "guile (define ar (history-ref 0))" \
 	    "get value (ar) from history"
 	gdb_scm_test_silent_cmd "guile (define ar0 (value-subscript ar 0))" \
@@ -133,11 +133,11 @@ proc test_fields {lang} {
 	# Test type-vector.
 	# Note: vectors cast differently than arrays.  Here ar[0] is replicated
 	# for the size of the vector.
-	gdb_scm_test_silent_cmd "print vec_data_1" "print value (vec_data_1)"
+	gdb_scm_test_silent_cmd "print vec_data_1" "print value, vec_data_1"
 	gdb_scm_test_silent_cmd "guile (define vec_data_1 (history-ref 0))" \
 	    "get value (vec_data_1) from history"
 
-	gdb_scm_test_silent_cmd "print vec_data_2" "print value (vec_data_2)"
+	gdb_scm_test_silent_cmd "print vec_data_2" "print value, vec_data_2"
 	gdb_scm_test_silent_cmd "guile (define vec_data_2 (history-ref 0))" \
 	    "get value (vec_data_2) from history"
 
@@ -192,7 +192,7 @@ proc test_equality {lang} {
 
 proc test_enums {} {
     with_test_prefix "test_enum" {
-	gdb_scm_test_silent_cmd "print e" "print value (e)"
+	gdb_scm_test_silent_cmd "print e" "print value, e"
 	gdb_scm_test_silent_cmd "guile (define e (history-ref 0))" \
 	    "get value (e) from history"
 	gdb_scm_test_silent_cmd "guile (define fields (type-fields (value-type e)))" \
@@ -208,9 +208,9 @@ proc test_enums {} {
 	gdb_test "guile (print (type-num-fields (value-type e)))" \
 	    "= 3" "check the number of enum values"
 	gdb_test "guile (print (field-name (type-field (value-type e) \"v1\")))" \
-	    "= v1" "check enum field lookup by name (v1)"
+	    "= v1" "check enum field lookup by name, v1"
 	gdb_test "guile (print (field-name (type-field (value-type e) \"v3\")))" \
-	    "= v3" "check enum field lookup by name (v3)"
+	    "= v3" "check enum field lookup by name, v3"
 	gdb_test "guile (print (iterator-map field-enumval (make-field-iterator (value-type e))))" \
 	    "\\(0 1 2\\)" "check enum fields iteration"
     }
@@ -218,7 +218,7 @@ proc test_enums {} {
 
 proc test_base_class {} {
     with_test_prefix "test_base_class" {
-	gdb_scm_test_silent_cmd "print d" "print value (d)"
+	gdb_scm_test_silent_cmd "print d" "print value, d"
 	gdb_scm_test_silent_cmd "guile (define d (history-ref 0))" \
 	    "get value (d) from history"
 	gdb_scm_test_silent_cmd "guile (define fields (type-fields (value-type d)))" \
@@ -226,9 +226,9 @@ proc test_base_class {} {
 	gdb_test "guile (print (length fields))" \
 	    "= 3" "check the number of fields"
 	gdb_test "guile (print (field-baseclass? (car fields)))" \
-	    "= #t" "check base class (fields\[0\])"
+	    "= #t" {check base class, fields[0]}
 	gdb_test "guile (print (field-baseclass? (cadr fields)))" \
-	    "= #f" "check base class (fields\[1\])"
+	    "= #f" {check base class, fields[1]}
     }
 }
 
@@ -236,7 +236,7 @@ proc test_range {} {
     with_test_prefix "test_range" {
 	with_test_prefix "on ranged value" {
 	    # Test a valid range request.
-	    gdb_scm_test_silent_cmd "print ar" "print value (ar)"
+	    gdb_scm_test_silent_cmd "print ar" "print value, ar"
 	    gdb_scm_test_silent_cmd "guile (define ar (history-ref 0))" \
 		"get value (ar) from history"
 	    gdb_test "guile (print (length (type-range (value-type ar))))" \
@@ -247,7 +247,7 @@ proc test_range {} {
 
 	with_test_prefix "on unranged value" {
 	    # Test where a range does not exist.
-	    gdb_scm_test_silent_cmd "print st" "print value (st)"
+	    gdb_scm_test_silent_cmd "print st" "print value, st"
 	    gdb_scm_test_silent_cmd "guile (define st (history-ref 0))" \
 		"get value (st) from history"
 	    gdb_test "guile (print (type-range (value-type st)))" \
@@ -256,7 +256,7 @@ proc test_range {} {
 	}
 
 	with_test_prefix "on flexible array member" {
-	    gdb_scm_test_silent_cmd "print f" "print value (f)"
+	    gdb_scm_test_silent_cmd "print f" "print value, f"
 	    gdb_scm_test_silent_cmd "guile (define f (history-ref 0))" \
 		"get value (f) from history"
 	    gdb_test "guile (print (type-range (field-type (type-field (value-type (value-dereference f)) \"items\"))))" \