[gdb/testsuite] Simplify gdb.base/complex-parts.exp

I noticed a lot of escaping in test-case gdb.base/complex-parts.exp.

Make the test-case more readable by using:
- string_to_regexp, and
- {} instead of "".

Tested on x86_64-linux and aarch64-linux.

diff --git a/gdb/testsuite/gdb.base/complex-parts.exp b/gdb/testsuite/gdb.base/complex-parts.exp
index e678cfcb899fc224b3324a93cac58f8524ac6a39..a0ead3eecf60f4c90d7b507f9af2d4ba393b7f80 100644 (file)
--- a/gdb/testsuite/gdb.base/complex-parts.exp
+++ b/gdb/testsuite/gdb.base/complex-parts.exp
@@ -23,12 +23,13 @@ if {![runto_main]} {
     return 0
 }
 
-gdb_breakpoint [gdb_get_line_number "Break Here"]
-gdb_continue_to_breakpoint "breakpt" ".* Break Here\\. .*"
+set marker " Break Here. "
+gdb_breakpoint [gdb_get_line_number $marker]
+gdb_continue_to_breakpoint "breakpt" ".*[string_to_regexp $marker].*"
 
-gdb_test "p z1" " = 1.5 \\+ 4.5i"
-gdb_test "p z2" " = 2.5 \\+ -5.5i"
-gdb_test "p z3" " = 3.5 \\+ 6.5i"
+gdb_test "p z1" [string_to_regexp " = 1.5 + 4.5i"]
+gdb_test "p z2" [string_to_regexp " = 2.5 + -5.5i"]
+gdb_test "p z3" [string_to_regexp " = 3.5 + 6.5i"]
 
 # The following 3 tests are broken for Clang.
 # More info at https://github.com/llvm/llvm-project/issues/52996.
@@ -40,59 +41,59 @@ if {[test_compiler_info clang-*-*]} { setup_xfail *-*-* }
 gdb_test "ptype z3" " = complex long double"
 
 with_test_prefix "double imaginary" {
-    gdb_test "p \$_cimag (z1)" " = 4.5"
-    gdb_test "ptype \$" " = double"
+    gdb_test {p $_cimag (z1)} " = 4.5"
+    gdb_test {ptype $} " = double"
 }
 
 with_test_prefix "float imaginary" {
-    gdb_test "p \$_cimag (z2)" " = -5.5"
-    gdb_test "ptype \$" " = float"
+    gdb_test {p $_cimag (z2)} " = -5.5"
+    gdb_test {ptype $} " = float"
 }
 
 with_test_prefix "long double imaginary" {
-    gdb_test "p \$_cimag (z3)" " = 6.5"
-    gdb_test "ptype \$" " = long double"
+    gdb_test {p $_cimag (z3)} " = 6.5"
+    gdb_test {ptype $} " = long double"
 }
 
 with_test_prefix "double real" {
-    gdb_test "p \$_creal (z1)" " = 1.5"
-    gdb_test "ptype \$" " = double"
+    gdb_test {p $_creal (z1)} " = 1.5"
+    gdb_test {ptype $} " = double"
 }
 
 with_test_prefix "float real" {
-    gdb_test "p \$_creal (z2)" " = 2.5"
-    gdb_test "ptype \$" " = float"
+    gdb_test {p $_creal (z2)} " = 2.5"
+    gdb_test {ptype $} " = float"
 }
 
 with_test_prefix "long double real" {
-    gdb_test "p \$_creal (z3)" " = 3.5"
-    gdb_test "ptype \$" " = long double"
+    gdb_test {p $_creal (z3)} " = 3.5"
+    gdb_test {ptype $} " = long double"
 }
 
-gdb_test "p \$_cimag (d1)" "expected a complex number"
-gdb_test "p \$_cimag (f1)" "expected a complex number"
-gdb_test "p \$_cimag (i1)" "expected a complex number"
+gdb_test {p $_cimag (d1)} "expected a complex number"
+gdb_test {p $_cimag (f1)} "expected a complex number"
+gdb_test {p $_cimag (i1)} "expected a complex number"
 
-gdb_test "p \$_creal (d1)" "expected a complex number"
-gdb_test "p \$_creal (f1)" "expected a complex number"
-gdb_test "p \$_creal (i1)" "expected a complex number"
+gdb_test {p $_creal (d1)} "expected a complex number"
+gdb_test {p $_creal (f1)} "expected a complex number"
+gdb_test {p $_creal (i1)} "expected a complex number"
 
 #
 # General complex number tests.
 #
 
-gdb_test "print 23 + 7i" " = 23 \\+ 7i"
-gdb_test "print 23.125f + 7i" " = 23.125 \\+ 7i"
-gdb_test "print 23 + 7.25fi" " = 23 \\+ 7.25i"
-gdb_test "print (23 + 7i) + (17 + 10i)" " = 40 \\+ 17i"
-gdb_test "print 23 + -7i" " = 23 \\+ -7i"
-gdb_test "print 23 - 7i" " = 23 \\+ -7i"
+gdb_test "print 23 + 7i" [string_to_regexp " = 23 + 7i"]
+gdb_test "print 23.125f + 7i" [string_to_regexp " = 23.125 + 7i"]
+gdb_test "print 23 + 7.25fi" [string_to_regexp " = 23 + 7.25i"]
+gdb_test "print (23 + 7i) + (17 + 10i)" [string_to_regexp " = 40 + 17i"]
+gdb_test "print 23 + -7i" [string_to_regexp " = 23 + -7i"]
+gdb_test "print 23 - 7i" [string_to_regexp " = 23 + -7i"]
 
-gdb_test "print -(23 + 7i)" " = -23 \\+ -7i"
-gdb_test "print +(23 + 7i)" " = 23 \\+ 7i"
-gdb_test "print ~(23 + 7i)" " = 23 \\+ -7i"
+gdb_test "print -(23 + 7i)" [string_to_regexp " = -23 + -7i"]
+gdb_test "print +(23 + 7i)" [string_to_regexp " = 23 + 7i"]
+gdb_test "print ~(23 + 7i)" [string_to_regexp " = 23 + -7i"]
 
-gdb_test "print (5 + 5i) * (2 + 2i)" " = 0 \\+ 20i"
+gdb_test "print (5 + 5i) * (2 + 2i)" [string_to_regexp " = 0 + 20i"]
 
 gdb_test "print (5 + 7i) == (5 + 7i)" " = 1"
 gdb_test "print (5 + 7i) == (8 + 7i)" " = 0"
@@ -101,14 +102,16 @@ gdb_test "print (5 + 7i) != (5 + 7i)" " = 0"
 gdb_test "print (5 + 7i) != (8 + 7i)" " = 1"
 gdb_test "print (5 + 7i) != (5 + 92i)" " = 1"
 
-gdb_test "print (20 - 4i) / (3 + 2i)" " = 4 \\+ -4i"
+gdb_test "print (20 - 4i) / (3 + 2i)" [string_to_regexp " = 4 + -4i"]
 
-gdb_test "print (_Complex int) 4" " = 4 \\+ 0i"
-gdb_test "print (_Complex float) 4.5" " = 4.5 \\+ 0i"
+gdb_test "print (_Complex int) 4" [string_to_regexp " = 4 + 0i"]
+gdb_test "print (_Complex float) 4.5" [string_to_regexp " = 4.5 + 0i"]
 gdb_test "ptype __complex__ short" " = _Complex short"
-gdb_test "print (_Complex int) (23.75 + 8.88i)" " = 23 \\+ 8i"
+gdb_test "print (_Complex int) (23.75 + 8.88i)" [string_to_regexp " = 23 + 8i"]
 
-set re_reject_arg "Argument to complex arithmetic operation not supported\\."
+set re_reject_arg \
+    [string_to_regexp \
+        "Argument to complex arithmetic operation not supported."]
 gdb_test "print (void *)0 + 5i" $re_reject_arg
 gdb_test "print (_Decimal32)0 + 5i" $re_reject_arg
 
@@ -117,4 +120,4 @@ clean_restart
 gdb_test_no_output "set language c++"
 
 # C++ type tests.
-gdb_test "print (bool)1 + 1i" " = 1 \\+ 1i"
+gdb_test "print (bool)1 + 1i" [string_to_regexp "= 1 + 1i"]