From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 45144 invoked by alias); 9 Nov 2016 16:37:18 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 45134 invoked by uid 89); 9 Nov 2016 16:37:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.8 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=polishing, five X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 09 Nov 2016 16:37:16 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CAFDF1B11; Wed, 9 Nov 2016 16:37:15 +0000 (UTC) Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uA9GbEl4015107; Wed, 9 Nov 2016 11:37:14 -0500 Subject: Re: [PATCH v2 2/5] Further cleanup/modernization of gdb.base/commands.exp To: Simon Marchi References: <1478650771-24430-1-git-send-email-palves@redhat.com> <1478650771-24430-3-git-send-email-palves@redhat.com> <994221f0964b21175ece863b9e4eed59@polymtl.ca> <1e856161-24c0-5f93-7847-a2bf9af57e8c@redhat.com> <937642fa3965d4029b5c98cb84a26954@polymtl.ca> <640edcd0-e0ee-c087-a2ac-f654beefb462@redhat.com> Cc: gdb-patches@sourceware.org From: Pedro Alves Message-ID: <0586eba2-a55b-7467-e412-4d230c3e3b01@redhat.com> Date: Wed, 09 Nov 2016 16:37:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <640edcd0-e0ee-c087-a2ac-f654beefb462@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-SW-Source: 2016-11/txt/msg00229.txt.bz2 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 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