From patchwork Wed Dec 4 11:41:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 36498 Received: (qmail 50922 invoked by alias); 4 Dec 2019 11:41: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 50812 invoked by uid 89); 4 Dec 2019 11:41:24 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.6 required=5.0 tests=AWL, 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.1 spammy=H*f:sk:cover.1 X-HELO: mail-wr1-f54.google.com Received: from mail-wr1-f54.google.com (HELO mail-wr1-f54.google.com) (209.85.221.54) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 04 Dec 2019 11:41:22 +0000 Received: by mail-wr1-f54.google.com with SMTP id a15so8161631wrf.9 for ; Wed, 04 Dec 2019 03:41:22 -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=Wh9xYbeI+yx12Y9u+knuPGDrzRjtmN193eKKPGzfUO4=; b=YwUUJKMdqkjgABJ2gnkPHm6z6vRn6+g62thBNfl0/9fvh8KEz3hBpxkadmwpP3CZ/t S/PANQ8Waj5FWX7a7cSzYNLi99HtzQ3wOxRwhuVCJfCLLt/Q+vv8YV5So1MXg/sMvEDN qTfwC4/ycksuAwtxRTP7nOSIZbXc23p38U22l8EquER0yY1OZjUGEqMXOMaLvX0bXP6a 1/BZtAr+zvtQjEhuOcoIySj+sBEFqWM4BsnMM84blklH5qH4AuNyW5GL+BPzwNzrygEy yaHSNWN4JUgKfRbajr9qieWYyoFqpTbI8fAcO/+0HLFy8qXSDJOaBuyNQNpkFArixxGi mg1g== Return-Path: Received: from localhost (host109-151-46-117.range109-151.btcentralplus.com. [109.151.46.117]) by smtp.gmail.com with ESMTPSA id s82sm6597597wms.28.2019.12.04.03.41.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Dec 2019 03:41:19 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH 3/3] gdb/fortran: Improve output pattern in gdb.mi/mi-fortran-modules.exp Date: Wed, 4 Dec 2019 11:41:14 +0000 Message-Id: In-Reply-To: References: In-Reply-To: References: X-IsSubscribed: yes Extend the output pattern in mi-fortran-modules.exp to skip some system modules that appear with versions of GFortran after 7.x.x. gdb/testsuite/ChangeLog: * gdb.mi/mi-fortran-modules.exp: Add pattern to skip system modules. Change-Id: I64aaa395e554a32e8267ffa096faee53c19c0b9e --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.mi/mi-fortran-modules.exp | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.mi/mi-fortran-modules.exp b/gdb/testsuite/gdb.mi/mi-fortran-modules.exp index 640bb12642d..eec2fe75da8 100644 --- a/gdb/testsuite/gdb.mi/mi-fortran-modules.exp +++ b/gdb/testsuite/gdb.mi/mi-fortran-modules.exp @@ -33,8 +33,12 @@ if {[mi_gdb_start]} { mi_run_to_main + +# Pattern to skip optional system modules that appear with later versions of GFortran. +set system_modules_pattern "\{filename=\"\[^\"\]+/ieee/\[^/\]+\.F90\",fullname=\"\[^\"\]+\",symbols=\\\[(\[^\]\]+)\\\]\}," + mi_gdb_test "101-symbol-info-modules" \ - "101\\^done,symbols=\{debug=\\\[\{filename=\"\[^\"\]+$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[\{line=\"16\",name=\"mod1\"\},\{line=\"27\",name=\"mod2\"\}\\\]\},\{filename=\"\[^\"\]+$srcfile\",fullname=\"\[^\"\]+$srcfile\",symbols=\\\[\{line=\"16\",name=\"mod3\"\},\{line=\"32\",name=\"modmany\"\},\{line=\"41\",name=\"moduse\"\}\\\]\}\\\]\}" \ + "101\\^done,symbols=\{debug=\\\[($system_modules_pattern)*\{filename=\"\[^\"\]+$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[\{line=\"16\",name=\"mod1\"\},\{line=\"27\",name=\"mod2\"\}\\\]\},\{filename=\"\[^\"\]+$srcfile\",fullname=\"\[^\"\]+$srcfile\",symbols=\\\[\{line=\"16\",name=\"mod3\"\},\{line=\"32\",name=\"modmany\"\},\{line=\"41\",name=\"moduse\"\}\\\]\}\\\]\}" \ "-symbol-info-modules" mi_gdb_test "102-symbol-info-modules --name mod\[123\]" \