From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 58462 invoked by alias); 24 Jul 2019 06:07:15 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 58453 invoked by uid 89); 24 Jul 2019 06:07:15 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.2 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=HX-Languages-Length:1620 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; Wed, 24 Jul 2019 06:07:14 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 9452BAFF9; Wed, 24 Jul 2019 06:07:11 +0000 (UTC) Date: Wed, 24 Jul 2019 06:07:00 -0000 From: Tom de Vries To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [committed][gdb/testsuite] Fix info-types.exp for debug info from more than one file Message-ID: <20190724060654.GA2083@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-IsSubscribed: yes X-SW-Source: 2019-07/txt/msg00544.txt.bz2 Hi, On openSUSE Leap 15.0, I get: ... FAIL: gdb.base/info-types.exp: l=c: info types FAIL: gdb.base/info-types.exp: l=c++: info types ... because the info type command prints info for files info-types.c, stddef.h, elf-init.c and init.c, while the regexp in the test-case expect only info for info-types.c. Fix this by extending the regexp. Tested on x86_64-linux. Committed to trunk. Thanks, - Tom [gdb/testsuite] Fix info-types.exp for debug info from more than one file gdb/testsuite/ChangeLog: 2019-07-24 Tom de Vries * gdb.base/info-types.exp: Allow info types to print info for more than one file. --- gdb/testsuite/gdb.base/info-types.exp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/gdb.base/info-types.exp b/gdb/testsuite/gdb.base/info-types.exp index 3a514b5bc1..fd190ae58f 100644 --- a/gdb/testsuite/gdb.base/info-types.exp +++ b/gdb/testsuite/gdb.base/info-types.exp @@ -86,7 +86,9 @@ proc run_test { lang } { "19:\[\t \]+typedef float nested_float_t;" \ "18:\[\t \]+typedef int nested_int_t;" \ "62:\[\t \]+typedef union_t nested_union_t;" \ - "\[\t \]+unsigned int"] + "\[\t \]+unsigned int(" \ + "" \ + "File .*:.*)?" ] } else { set output_re \ [multi_line \ @@ -116,7 +118,9 @@ proc run_test { lang } { "18:\[\t \]+typedef int nested_int_t;" \ "62:\[\t \]+typedef union union_t nested_union_t;" \ "56:\[\t \]+union union_t;" \ - "\[\t \]+unsigned int" ] + "\[\t \]+unsigned int(" \ + "" \ + "File .*:.*)?" ] } gdb_test "info types" $output_re