From patchwork Wed Nov 9 15:56:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 17339 Received: (qmail 129954 invoked by alias); 9 Nov 2016 15:56:57 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 128739 invoked by uid 89); 9 Nov 2016 15:56:56 -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=7847 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 15:56:55 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (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 32EA480510; Wed, 9 Nov 2016 15:56:54 +0000 (UTC) Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uA9Fuq2H031863; Wed, 9 Nov 2016 10:56:53 -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> Cc: gdb-patches@sourceware.org From: Pedro Alves Message-ID: <1e856161-24c0-5f93-7847-a2bf9af57e8c@redhat.com> Date: Wed, 9 Nov 2016 15:56:52 +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: <994221f0964b21175ece863b9e4eed59@polymtl.ca> On 11/09/2016 03:02 AM, Simon Marchi wrote: > On 2016-11-08 19:19, Pedro Alves wrote: >> - Use multi_line for matching multi-line GDB output. >> >> - Add a multi_line_input variant of multi_line to build GDB input and >> use it throughout. >> >> (The two changes above make the tests much more readable, IMO.) >> >> - Remove gdb_stop_suppressing_tests uses. >> >> - tighten a few regexps. >> >> - Replace send_gdb/gdb_expect with gdb_test_multiple and simplify, >> making pass/fail messages the same. > > I agree, the test is now much more readable. > >> + gdb_test \ >> + [multi_line_input \ >> + "while \$foo > 0" \ >> + " p/x 0xfeedface" \ >> + " set \$foo -= 1" \ >> + "end"] \ >> + [multi_line \ >> + "\\\$\[0-9\]* = 0xfeedface\[^\n\]*" \ >> + "\\\$\[0-9\]* = 0xfeedface\[^\n\]*" \ >> + "\\\$\[0-9\]* = 0xfeedface\[^\n\]*" \ >> + "\\\$\[0-9\]* = 0xfeedface\[^\n\]*" \ >> + "\\\$\[0-9\]* = 0xfeedface"] \ >> + "#1" > > In these instance, what is the [^\n] meant to match? Is it the \r? In > that case, multi_line matches it, so I think we can get rid of them > (throughout the file). > Indeed. I did that now, with the patchlet below, and the test still passes. Also found another place where we could use multi_line. From 9363d1c3a008337d1f56e94d8dc51e17ebd02ab0 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 9 Nov 2016 15:36:45 +0000 Subject: [PATCH] review --- gdb/testsuite/gdb.base/commands.exp | 49 +++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp index b6c8f9e..c4bf425 100644 --- a/gdb/testsuite/gdb.base/commands.exp +++ b/gdb/testsuite/gdb.base/commands.exp @@ -72,10 +72,10 @@ proc_with_prefix gdbvar_simple_while_test {} { " set \$foo -= 1" \ "end"] \ [multi_line \ - "\\\$\[0-9\]* = 0xfeedface\[^\n\]*" \ - "\\\$\[0-9\]* = 0xfeedface\[^\n\]*" \ - "\\\$\[0-9\]* = 0xfeedface\[^\n\]*" \ - "\\\$\[0-9\]* = 0xfeedface\[^\n\]*" \ + "\\\$\[0-9\]* = 0xfeedface" \ + "\\\$\[0-9\]* = 0xfeedface" \ + "\\\$\[0-9\]* = 0xfeedface" \ + "\\\$\[0-9\]* = 0xfeedface" \ "\\\$\[0-9\]* = 0xfeedface"] \ "#1" } @@ -96,9 +96,9 @@ proc_with_prefix gdbvar_complex_if_while_test {} { " end" \ "end"] \ [multi_line \ - "\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*" \ - "\\\$\[0-9\]* = 0xfeedface\[^\n\]*" \ - "\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*" \ + "\\\$\[0-9\]* = 0xdeadbeef" \ + "\\\$\[0-9\]* = 0xfeedface" \ + "\\\$\[0-9\]* = 0xdeadbeef" \ "\\\$\[0-9\]* = 0xfeedface"] \ "#1" } @@ -150,10 +150,10 @@ proc_with_prefix progvar_simple_while_test {} { " set value -= 1" \ "end"] \ [multi_line \ - "\\\$\[0-9\]* = 0xfeedface\[^\n\]*" \ - "\\\$\[0-9\]* = 0xfeedface\[^\n\]*" \ - "\\\$\[0-9\]* = 0xfeedface\[^\n\]*" \ - "\\\$\[0-9\]* = 0xfeedface\[^\n\]*" \ + "\\\$\[0-9\]* = 0xfeedface" \ + "\\\$\[0-9\]* = 0xfeedface" \ + "\\\$\[0-9\]* = 0xfeedface" \ + "\\\$\[0-9\]* = 0xfeedface" \ "\\\$\[0-9\]* = 0xfeedface"] \ "#1" } @@ -179,9 +179,9 @@ proc_with_prefix progvar_complex_if_while_test {} { " end" \ "end"] \ [multi_line \ - "\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*" \ - "\\\$\[0-9\]* = 0xfeedface\[^\n\]*" \ - "\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*" \ + "\\\$\[0-9\]* = 0xdeadbeef" \ + "\\\$\[0-9\]* = 0xfeedface" \ + "\\\$\[0-9\]* = 0xdeadbeef" \ "\\\$\[0-9\]* = 0xfeedface"] \ "#1" } @@ -218,9 +218,9 @@ proc_with_prefix if_while_breakpoint_command_test {} { gdb_test \ "continue" \ [multi_line \ - "\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*" \ - "\\\$\[0-9\]* = 0xfeedface\[^\n\]*" \ - "\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*" \ + "\\\$\[0-9\]* = 0xdeadbeef" \ + "\\\$\[0-9\]* = 0xfeedface" \ + "\\\$\[0-9\]* = 0xdeadbeef" \ "\\\$\[0-9\]* = 0xfeedface"] \ "#1" gdb_test "info break" "while.*set.*if.*p/x.*else.*p/x.*end.*" @@ -309,9 +309,9 @@ proc_with_prefix user_defined_command_test {} { gdb_test \ "mycommand \$foo" \ [multi_line \ - "\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*" \ - "\\\$\[0-9\]* = 0xfeedface\[^\n\]*" \ - "\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*" \ + "\\\$\[0-9\]* = 0xdeadbeef" \ + "\\\$\[0-9\]* = 0xfeedface" \ + "\\\$\[0-9\]* = 0xdeadbeef" \ "\\\$\[0-9\]* = 0xfeedface"] \ "execute user-defined command" gdb_test "show user mycommand" \ @@ -784,7 +784,14 @@ proc_with_prefix error_clears_commands_left {} { gdb_test_no_output "end" "main commands 2c" gdb_run_cmd - gdb_test "" "hook-stop1\r\n.*\r\ncmd1\r\nUndefined command: \"errorcommandxy\"\\. Try \"help\"\\." "cmd1 error" + gdb_test \ + "" \ + [multi_line \ + "hook-stop1" \ + ".*" \ + "cmd1" \ + "Undefined command: \"errorcommandxy\"\\. Try \"help\"\\."] \ + "cmd1 error" gdb_test {echo idle\n} "\r\nidle" "no cmd2" }