From patchwork Tue Nov 27 11:13:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 30316 Received: (qmail 69444 invoked by alias); 27 Nov 2018 11:13:24 -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 69267 invoked by uid 89); 27 Nov 2018 11:13:23 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=transfers, beg, transfer X-HELO: mail-wm1-f54.google.com Received: from mail-wm1-f54.google.com (HELO mail-wm1-f54.google.com) (209.85.128.54) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 27 Nov 2018 11:13:20 +0000 Received: by mail-wm1-f54.google.com with SMTP id g67so8271753wmd.2 for ; Tue, 27 Nov 2018 03:13:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=74hmIg8GDdZ2uDkyx2KTXQ3d3RkPWGDuPPkganyoGBg=; b=CMmfNb1Djtc21D4NnRC7HoE5bijMgiu8NevJ82NxogPrCrU4C5e/4cBAlypfGWbAZJ KqFsSMsnbyW3uXyFKD9ic4DuYlICtXD85swapwC2M0hwfTj/AUCS/15IjRMc+GhOi7lH Jo9LNd9+xRK50s5RL7R17W2O/11JqFox/pR/dRM2cmDwUS1HlQoGibktf/Nz5/h7a811 aD/w4qwXuNcgVHHc0HkQWFzUxU+Z2rDuZBogIhdoxBG5h9dLTqJUJ7NZsXHJluJgpTxk CeYaQ04OcnVzhho91LD6q7aaSNHVANnDyeavySVbSSniVSMCNvXsm80oiZZB+DLSI3UD +BmA== Return-Path: Received: from localhost (host86-156-236-171.range86-156.btcentralplus.com. [86.156.236.171]) by smtp.gmail.com with ESMTPSA id b13sm4175836wrn.28.2018.11.27.03.13.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Nov 2018 03:13:17 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Simon Marchi , Andrew Burgess Subject: [PATCHv2 3/3] gdb: Update test pattern to deal with native-extended-gdbserver Date: Tue, 27 Nov 2018 11:13:06 +0000 Message-Id: In-Reply-To: References: In-Reply-To: References: X-IsSubscribed: yes When running the test gdb.base/annota1.exp with: make check-gdb RUNTESTFLAGS="--target_board=native-extended-gdbserver gdb.base/annota1.exp" I would see a failure due to some unexpecte lines in GDB's output. The extra lines (when compared with a native run) were about file transfer from the remote back to GDB. This commit extends the regexp for this test to allow for these extra lines, and also splits the rather long regexp up into a list of parts. With this change in place I see no failures for gdb.base/annota1.exp when using the native-extended-gdbserver target board, nor with a native run on X86-64/Linux. gdb/testsuite/ChangeLog: * gdb.base/annota1.exp: Update a test regexp. --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.base/annota1.exp | 23 +++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp index 4b34aa84f29..b5a0e87c3ad 100644 --- a/gdb/testsuite/gdb.base/annota1.exp +++ b/gdb/testsuite/gdb.base/annota1.exp @@ -127,8 +127,27 @@ gdb_test_multiple "info break" "breakpoint info" { #exp_internal 1 set binexp [string_to_regexp $binfile] gdb_test_multiple "run" "run until main breakpoint" { - -re "\r\n\032\032post-prompt\r\nStarting program: $binexp \(\r\nwarning: Skipping \[^\r\n\]+ .gdb_index section in \[^\r\n\]+\r\nDo \"set use-deprecated-index-sections on\" before the file is read\r\nto use the section anyway\\.\)?\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n\032\032starting\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n\032\032breakpoint 1\r\n\r\nBreakpoint 1, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*annota1.c\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$main_line\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*$srcfile:$main_line:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped.*$gdb_prompt$" { - pass "run until main breakpoint" + -re [join { "\r\n\032\032post-prompt\r\nStarting program: $binexp " \ + "\(\(\r\nReading \[^\r\n\]+\)|\(\r\nwarning: File transfers from remote targets can be slow\[^\r\n\]+\)\)*" \ + "\(\r\nwarning: Skipping \[^\r\n\]+ .gdb_index section in \[^\r\n\]+\r\nDo \"set use-deprecated-index-sections on\" before the file is read\r\nto use the section anyway\\.\)?" \ + "\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n" \ + "\032\032starting\(\(\r\nReading \[^\r\n\]+\)|\(\r\nwarning: File transfers from remote targets can be slow\[^\r\n\]+\)\)*" \ + "\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n" \ + "\032\032breakpoint 1\r\n\r\n" \ + "Breakpoint 1, \r\n" \ + "\032\032frame-begin 0 $hex\r\n\r\n" \ + "\032\032frame-function-name\r\n" \ + "main\r\n" \ + "\032\032frame-args\r\n \\(\\)\r\n" \ + "\032\032frame-source-begin\r\n at \r\n" \ + "\032\032frame-source-file\r\n.*annota1.c\r\n" \ + "\032\032frame-source-file-end\r\n:\r\n" \ + "\032\032frame-source-line\r\n$main_line\r\n" \ + "\032\032frame-source-end\r\n\r\n\r\n" \ + "\032\032source.*$srcfile:$main_line:.*:beg:$hex\r\n\r\n" \ + "\032\032frame-end\r\n\r\n" \ + "\032\032stopped.*$gdb_prompt$" } ] { + pass "run until main breakpoint" } } #exp_internal 0