From patchwork Mon Apr 16 18:58:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Arnez X-Patchwork-Id: 26758 Received: (qmail 23364 invoked by alias); 16 Apr 2018 18:59:09 -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 22695 invoked by uid 89); 16 Apr 2018 18:59:07 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1896 X-HELO: mx0a-001b2d01.pphosted.com Received: from mx0b-001b2d01.pphosted.com (HELO mx0a-001b2d01.pphosted.com) (148.163.158.5) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 16 Apr 2018 18:59:05 +0000 Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w3GIo7P3062470 for ; Mon, 16 Apr 2018 14:59:04 -0400 Received: from e06smtp11.uk.ibm.com (e06smtp11.uk.ibm.com [195.75.94.107]) by mx0b-001b2d01.pphosted.com with ESMTP id 2hcyve4g9x-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Mon, 16 Apr 2018 14:59:03 -0400 Received: from localhost by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 16 Apr 2018 19:59:01 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 16 Apr 2018 19:58:59 +0100 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w3GIwwH253280824 for ; Mon, 16 Apr 2018 18:58:58 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A1DB7AE04D for ; Mon, 16 Apr 2018 19:48:49 +0100 (BST) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8782EAE045 for ; Mon, 16 Apr 2018 19:48:49 +0100 (BST) Received: from oc1027705133.ibm.com (unknown [9.152.212.201]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTPS for ; Mon, 16 Apr 2018 19:48:49 +0100 (BST) From: Andreas Arnez To: gdb-patches@sourceware.org Subject: [pushed] [obv] Adjust more test cases to changed output of info var/func/type Date: Mon, 16 Apr 2018 20:58:51 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 18041618-0040-0000-0000-0000044E342B X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18041618-0041-0000-0000-000020F2776B Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-04-16_09:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1804160162 After this commit: b744723f57 -- Show line numbers in output for "info var/func/type" the test cases dbx.exp and info-fun.exp yield new FAILs because two regular expressions have not been adjusted to the changed output yet. This is fixed. gdb/testsuite/ChangeLog: * gdb.base/dbx.exp (test_whereis): Adjust regexp to added line number information in output of "whereis" command. * gdb.base/info-fun.exp: Likewise, for "info fun" command. --- gdb/testsuite/gdb.base/dbx.exp | 2 +- gdb/testsuite/gdb.base/info-fun.exp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/gdb.base/dbx.exp b/gdb/testsuite/gdb.base/dbx.exp index 0cc5e8298b..40e02380cb 100644 --- a/gdb/testsuite/gdb.base/dbx.exp +++ b/gdb/testsuite/gdb.base/dbx.exp @@ -267,7 +267,7 @@ proc test_assign { } { #test_whereis # proc test_whereis { } { - gdb_test "whereis my_list" "All variables matching regular expression \"my_list\":\r\n\r\nFile.*average\.c:\r\nstatic int my_list\\\[10\\\];" + gdb_test "whereis my_list" "All variables matching regular expression \"my_list\":\r\n\r\nFile.*average\.c:\r\n.*\tstatic int my_list\\\[10\\\];" } # diff --git a/gdb/testsuite/gdb.base/info-fun.exp b/gdb/testsuite/gdb.base/info-fun.exp index f298bf70b6..d527dac544 100644 --- a/gdb/testsuite/gdb.base/info-fun.exp +++ b/gdb/testsuite/gdb.base/info-fun.exp @@ -63,7 +63,7 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" { set match_str {All functions matching regular expression "foo":[\r\n]*} if { "$libsepdebug" != "NO" } { append match_str {File .*/info-fun-solib[.]c:[\r\n]*} - append match_str {int foo\(void\);[\r\n]*} + append match_str {\d+:\tint foo\(void\);[\r\n]*} } append match_str {Non-debugging symbols:[\r\n]*} # Note: Targets like {m68k,ppc64,s390x}-linux also have, e.g.,