From patchwork Fri Dec 2 17:05:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Machado X-Patchwork-Id: 18138 Received: (qmail 22104 invoked by alias); 2 Dec 2016 17:06:01 -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 22083 invoked by uid 89); 2 Dec 2016 17:05:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=sk:regress X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 02 Dec 2016 17:05:49 +0000 Received: from svr-orw-fem-04.mgc.mentorg.com ([147.34.97.41]) by relay1.mentorg.com with esmtp id 1cCrHQ-0000im-0i from Luis_Gustavo@mentor.com ; Fri, 02 Dec 2016 09:05:48 -0800 Received: from Opsys.world.mentorg.com (147.34.91.1) by svr-orw-fem-04.mgc.mentorg.com (147.34.97.41) with Microsoft SMTP Server id 14.3.224.2; Fri, 2 Dec 2016 09:05:47 -0800 From: Luis Machado To: , Subject: [PATCH] Remove unneeded pattern matching in gdb.base/maint.exp Date: Fri, 2 Dec 2016 11:05:45 -0600 Message-ID: <1480698345-9779-1-git-send-email-lgustavo@codesourcery.com> MIME-Version: 1.0 X-IsSubscribed: yes This gets rid of more useless pattern matching cases in gdb.base/maint.exp. It is a follow-on to the previous patch that only removed the timeouts. Regression-checked by running gdb.base/maint.exp. gdb/testsuite/ChangeLog: 2016-12-02 Luis Machado * gdb.base/maint.exp: Remove gdb_prompt and timeout handling in gdb_test_multiple calls. Use gdb_test instead of gdb_test_multiple when possible. --- gdb/testsuite/gdb.base/maint.exp | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp index 17c606b..9d08ff1 100644 --- a/gdb/testsuite/gdb.base/maint.exp +++ b/gdb/testsuite/gdb.base/maint.exp @@ -71,7 +71,7 @@ gdb_test "maint print registers" "Name.*Nr.*Rel.*Offset.*Size.*Type.*" gdb_test_no_output "mt set per on" "mt set per on for expand-symtabs" gdb_test_multiple "mt expand-symtabs $subdir/break\[.\]c$" \ "mt expand-symtabs" { - -re "#compunits: (1|2) \\(\[+\](0|1|2)\\),.*$gdb_prompt $" { + -re "#compunits: (1|2) \\(\[+\](0|1|2)\\),.*" { # This should expand at most two primary symtabs. # "Normally" it will not expand any, because the symtab # holding "main" will already have been expanded, but if the @@ -93,7 +93,7 @@ if ![runto_main] then { # If we're using .gdb_index there will be no psymtabs. set have_gdb_index 0 gdb_test_multiple "maint info sections .gdb_index" "check for .gdb_index" { - -re ": .gdb_index.*$gdb_prompt $" { + -re ": .gdb_index.*" { set have_gdb_index 1 } -re ".*$gdb_prompt $" { @@ -287,29 +287,18 @@ gdb_test "cd [standard_output_file {}]" \ "cd to objdir" gdb_test_multiple "maint print msymbols msymbols_output2 ${testfile}" "maint print msymbols" { - -re "^maint print msymbols msymbols_output2 \[^\n\]*\r\n$gdb_prompt $" { + -re "^maint print msymbols msymbols_output2 \[^\n\]*\r\n" { gdb_test_multiple "shell ls msymbols_output2" "maint print msymbols" { -re "msymbols_output2\r\n$gdb_prompt $" { - gdb_test_multiple "shell grep factorial msymbols_output2" "maint print msymbols" { - -re "\\\[ *$decimal\\\] \[tT\]\[ \t\]+$hex \\.?factorial.*$gdb_prompt $" { - pass "maint print msymbols" - } - -re ".*$gdb_prompt $" { - fail "maint print msymbols" - } - } - gdb_test "shell rm -f msymbols_output2" ".*" \ - "shell rm -f msymbols_output2" - } - -re ".*$gdb_prompt $" { - fail "maint print msymbols" + gdb_test "shell grep factorial msymbols_output2" \ + "\\\[ *$decimal\\\] \[tT\]\[ \t\]+$hex \\.?factorial.*" \ + "maint print msymbols" + gdb_test "shell rm -f msymbols_output2" ".*" } } } - -re ".*$gdb_prompt $" { - fail "maint print msymbols" - } } + gdb_test "cd ${mydir}" \ "Working directory [string_to_regexp ${mydir}]\..*" \ "cd to mydir"