This is the mail archive of the gdb-patches@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH v2 2/5] Further cleanup/modernization of gdb.base/commands.exp


On 11/09/2016 04:22 PM, Pedro Alves wrote:
> On 11/09/2016 04:09 PM, Simon Marchi wrote:

>> That's not bad.  I was going to suggest using {} instead of "" to get
>> rid of most backslashes (untested):
>>
>> -"\\\$\[0-9\]* = 0xdeadbeef"
>> +{\$[0-9]* = 0xdeadbeef}
> 
> I strikes me that I can use {}when building the input strings.  I was
> already doing it in the new tests added by the following patches, but
> not in this one, for some reason.  Let me give that a try.

Like this.  Done throughout for consistency.

Must stop polishing this.  :-)

>From afc965b18044f47c15a3eae9a8d8adb3211b1716 Mon Sep 17 00:00:00 2001
From: Pedro Alves <palves@redhat.com>
Date: Wed, 9 Nov 2016 16:21:30 +0000
Subject: [PATCH] {}

---
 gdb/testsuite/gdb.base/commands.exp | 142 ++++++++++++++++++------------------
 1 file changed, 71 insertions(+), 71 deletions(-)

diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp
index 44947f2..ba94174 100644
--- a/gdb/testsuite/gdb.base/commands.exp
+++ b/gdb/testsuite/gdb.base/commands.exp
@@ -41,22 +41,22 @@ proc_with_prefix gdbvar_simple_if_test {} {
     # All this test should do is print 0xdeadbeef once.
     gdb_test \
 	[multi_line_input \
-	     "if \$foo == 1" \
-	     "  p/x 0xfeedface" \
-	     "else" \
-	     "  p/x 0xdeadbeef" \
-	     "end"] \
+	     {if $foo == 1} \
+	     {  p/x 0xfeedface} \
+	     {else} \
+	     {  p/x 0xdeadbeef} \
+	     {end}] \
 	"$valnum_re = 0xdeadbeef" \
 	"#1"
 
     # All this test should do is print 0xfeedface once.
     gdb_test \
 	[multi_line_input \
-	     "if \$foo == 0" \
-	     "  p/x 0xfeedface" \
-	     "else" \
-	     "  p/x 0xdeadbeef" \
-	     "end"] \
+	     {if $foo == 0} \
+	     {  p/x 0xfeedface} \
+	     {else} \
+	     {  p/x 0xdeadbeef} \
+	     {end}] \
 	"$valnum_re = 0xfeedface" \
 	"#2"
 }
@@ -69,10 +69,10 @@ proc_with_prefix gdbvar_simple_while_test {} {
     # This test should print 0xfeedface five times.
     gdb_test \
 	[multi_line_input \
-	     "while \$foo > 0" \
-	     "  p/x 0xfeedface" \
-	     "  set \$foo -= 1" \
-	     "end"] \
+	     {while $foo > 0} \
+	     {  p/x 0xfeedface} \
+	     {set $foo -= 1} \
+	     {end}] \
 	[multi_line \
 	     "$valnum_re = 0xfeedface" \
 	     "$valnum_re = 0xfeedface" \
@@ -90,14 +90,14 @@ proc_with_prefix gdbvar_complex_if_while_test {} {
     # This test should alternate between 0xdeadbeef and 0xfeedface two times.
     gdb_test \
 	[multi_line_input \
-	     "while \$foo > 0" \
-	     "  set \$foo -= 1" \
-	     "  if \(\$foo % 2\) == 1" \
-	     "    p/x 0xdeadbeef" \
-	     "  else" \
-	     "    p/x 0xfeedface" \
-	     "  end" \
-	     "end"] \
+	     {while $foo > 0} \
+	     {  set $foo -= 1} \
+	     {  if ($foo % 2) == 1} \
+	     {    p/x 0xdeadbeef} \
+	     {  else} \
+	     {    p/x 0xfeedface} \
+	     {  end} \
+	     {end}] \
 	[multi_line \
 	     "$valnum_re = 0xdeadbeef" \
 	     "$valnum_re = 0xfeedface" \
@@ -118,22 +118,22 @@ proc_with_prefix progvar_simple_if_test {} {
     # All this test should do is print 0xdeadbeef once.
     gdb_test \
 	[multi_line_input \
-	     "if value == 1" \
-	     "  p/x 0xfeedface" \
-	     "else" \
-	     "  p/x 0xdeadbeef" \
-	     "end"] \
+	     {if value == 1} \
+	     {  p/x 0xfeedface} \
+	     {else} \
+	     {  p/x 0xdeadbeef} \
+	     {end}] \
 	"$valnum_re = 0xdeadbeef" \
 	"#1"
 
     # All this test should do is print 0xfeedface once.
     gdb_test \
 	[multi_line_input \
-	     "if value == 5" \
-	     "  p/x 0xfeedface" \
-	     "else" \
-	     "  p/x 0xdeadbeef" \
-	     "end"] \
+	     {if value == 5} \
+	     {  p/x 0xfeedface} \
+	     {else} \
+	     {  p/x 0xdeadbeef} \
+	     {end}] \
 	"$valnum_re = 0xfeedface" \
 	"#2"
 }
@@ -150,10 +150,10 @@ proc_with_prefix progvar_simple_while_test {} {
     # This test should print 0xfeedface five times.
     gdb_test \
 	[multi_line_input \
-	     "while value > 0" \
-	     "  p/x 0xfeedface" \
-	     "  set value -= 1" \
-	     "end"] \
+	     {while value > 0} \
+	     {  p/x 0xfeedface} \
+	     {  set value -= 1} \
+	     {end}] \
 	[multi_line \
 	     "$valnum_re = 0xfeedface" \
 	     "$valnum_re = 0xfeedface" \
@@ -176,14 +176,14 @@ proc_with_prefix progvar_complex_if_while_test {} {
     # times.
     gdb_test \
 	[multi_line_input \
-	     "while value > 0" \
-	     "  set value -= 1" \
-	     "  if \(value % 2\) == 1" \
-	     "    p/x 0xdeadbeef" \
-	     "  else" \
-	     "    p/x 0xfeedface" \
-	     "  end" \
-	     "end"] \
+	     {while value > 0} \
+	     {  set value -= 1} \
+	     {  if (value % 2) == 1} \
+	     {    p/x 0xdeadbeef} \
+	     {  else} \
+	     {    p/x 0xfeedface} \
+	     {  end} \
+	     {end}] \
 	[multi_line \
 	     "$valnum_re = 0xdeadbeef" \
 	     "$valnum_re = 0xfeedface" \
@@ -212,15 +212,15 @@ proc_with_prefix if_while_breakpoint_command_test {} {
     # This test should alternate between 0xdeadbeef and 0xfeedface two times.
     gdb_test \
 	[multi_line_input \
-	     "while value > 0" \
-	     "  set value -= 1" \
-	     "  if \(value % 2\) == 1" \
-	     "    p/x 0xdeadbeef" \
-	     "  else" \
-	     "    p/x 0xfeedface" \
-	     "  end" \
-	     "end" \
-	     "end"] \
+	     {while value > 0} \
+	     {  set value -= 1} \
+	     {  if (value % 2) == 1} \
+	     {    p/x 0xdeadbeef} \
+	     {  else} \
+	     {    p/x 0xfeedface} \
+	     {  end} \
+	     {end} \
+	     {end}] \
 	"" \
 	"commands part 2"
     gdb_test \
@@ -277,9 +277,9 @@ proc_with_prefix breakpoint_command_test {} {
     gdb_test "break factorial" "Breakpoint.*at.*"
     gdb_test \
 	[multi_line_input \
-	     "commands" \
-	     "  printf \"Now the value is %d\\n\", value" \
-	     "end"] \
+	     {commands} \
+	     {  printf "Now the value is %d\n", value} \
+	     {end}] \
 	"End with.*" \
 	"commands"
     gdb_test "continue" \
@@ -303,15 +303,15 @@ proc_with_prefix user_defined_command_test {} {
     # This test should alternate between 0xdeadbeef and 0xfeedface two times.
     gdb_test \
 	[multi_line_input \
-	     "while \$arg0 > 0" \
-	     "  set \$arg0 -= 1" \
-	     "  if \(\$arg0 % 2\) == 1" \
-	     "    p/x 0xdeadbeef" \
-	     "  else" \
-	     "    p/x 0xfeedface" \
-	     "  end" \
-	     "end" \
-	     "end"] \
+	     {while $arg0 > 0} \
+	     {  set $arg0 -= 1} \
+	     {  if ($arg0 % 2) == 1} \
+	     {    p/x 0xdeadbeef} \
+	     {  else} \
+	     {    p/x 0xfeedface} \
+	     {  end} \
+	     {end} \
+	     {end}] \
 	"" \
 	"enter commands"
 
@@ -319,7 +319,7 @@ proc_with_prefix user_defined_command_test {} {
     set valnum_re "\\\$$decimal"
 
     gdb_test \
-	"mycommand \$foo" \
+	{mycommand $foo} \
 	[multi_line \
 	     "$valnum_re = 0xdeadbeef" \
 	     "$valnum_re = 0xfeedface" \
@@ -438,11 +438,11 @@ proc_with_prefix test_command_prompt_position {} {
     # All this test should do is print 0xdeadbeef once.
     gdb_test \
 	[multi_line_input \
-	     "if value == 1" \
-	     "  p/x 0xfeedface" \
-	     "else" \
-	     "  p/x 0xdeadbeef" \
-	     "end"] \
+	     {if value == 1} \
+	     {  p/x 0xfeedface} \
+	     {else} \
+	     {  p/x 0xdeadbeef} \
+	     {end}] \
 	"$valnum_re = 0xdeadbeef" \
 	"if test"
 
-- 
2.5.5



Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]