From patchwork Thu Oct 17 08:08:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 35083 Received: (qmail 54088 invoked by alias); 17 Oct 2019 08:08:25 -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 54080 invoked by uid 89); 17 Oct 2019 08:08:24 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 17 Oct 2019 08:08:23 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id B1AB1B2C8; Thu, 17 Oct 2019 08:08:21 +0000 (UTC) Date: Thu, 17 Oct 2019 10:08:19 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [committed][gdb/testsuite] Fix gdb.fortran/module.exp for debug info from other files Message-ID: <20191017080818.GA6864@delia> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-IsSubscribed: yes Hi, On openSUSE Leap 15.1, I get: ... FAIL: gdb.fortran/module.exp: info variables -n ... because the info variables command prints info also for init.c: ... File init.c:^M 24: const int _IO_stdin_used;^M ... while the regexps in the test-case only expect info for module.f90. Fix this by extending the regexps. Tested on x86_64-linux. Committed to trunk. Thanks, - Tom [gdb/testsuite] Fix gdb.fortran/module.exp for debug info from other files gdb/testsuite/ChangeLog: 2019-10-17 Tom de Vries * gdb.fortran/module.exp: Allow info variables to print info for files other than module.f90. Change-Id: I401d8018b121fc7343f6bc8b671900349462457f --- gdb/testsuite/gdb.fortran/module.exp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.fortran/module.exp b/gdb/testsuite/gdb.fortran/module.exp index 276f7dc3c24..a2aff3cb7c7 100644 --- a/gdb/testsuite/gdb.fortran/module.exp +++ b/gdb/testsuite/gdb.fortran/module.exp @@ -53,7 +53,10 @@ gdb_test "info variables -n" \ "33:\[ \t\]+${int_type} modmany::var_c;" \ "33:\[ \t\]+${int_type} modmany::var_i;" \ "37:\[ \t\]+${int_type} moduse::var_x;" \ - "37:\[ \t\]+${int_type} moduse::var_y;" ] + "37:\[ \t\]+${int_type} moduse::var_y;(" \ + "" \ + "File .*:(" \ + "$decimal:.*)+)*"] # Do not use simple single-letter names as GDB would pick up for expectedly