From patchwork Mon Mar 28 16:39:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 88640 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id A51EAB6F8C for ; Tue, 29 Mar 2011 03:40:02 +1100 (EST) Received: (qmail 5049 invoked by alias); 28 Mar 2011 16:39:54 -0000 Received: (qmail 4921 invoked by uid 22791); 28 Mar 2011 16:39:50 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 28 Mar 2011 16:39:45 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 01DF151E; Mon, 28 Mar 2011 18:39:44 +0200 (CEST) Received: from smtp-relay.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id o9L7kUNVrsX8; Mon, 28 Mar 2011 18:39:41 +0200 (CEST) Received: from manam.CeBiTec.Uni-Bielefeld.DE (manam.CeBiTec.Uni-Bielefeld.DE [129.70.161.120]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id 80D3951D; Mon, 28 Mar 2011 18:39:41 +0200 (CEST) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.4+Sun/8.14.4/Submit) id p2SGdc1Y003012; Mon, 28 Mar 2011 18:39:38 +0200 (MEST) From: Rainer Orth To: gcc-patches@gcc.gnu.org Cc: "Dominique d'Humieres" Subject: [testsuite] Generalize REs in gcc.dg/debug/dwarf2/pr47939-[1-4].c (PR testsuite/48238) Date: Mon, 28 Mar 2011 18:39:37 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (usg-unix-v) MIME-Version: 1.0 X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org As described in the PR, four new DWARF-2 tests FAIL on Solaris 2 with Sun as, IRIX 6.5 with gas, and Darwin. Dominique provided the following patch. Tested with the appropriate runtest invocations on i386-pc-solaris2.11 with Sun as and gas and mips-sgi-irix6.5 by myself, and x86_64-apple-darwin10.6.0 by Dominique. Installed on mainline. Rainer 2011-03-26 Dominique d'Humieres PR testsuite/48238 * gcc.dg/debug/dwarf2/pr47939-1.c: Generalize scan-assembler regex. * gcc.dg/debug/dwarf2/pr47939-2.c: Likewise. * gcc.dg/debug/dwarf2/pr47939-3.c: Likewise. * gcc.dg/debug/dwarf2/pr47939-4.c: Likewise. diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-1.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-1.c --- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-1.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-1.c @@ -4,5 +4,5 @@ typedef struct _Harry { int dummy; } Harry_t; Harry_t harry; -/* { dg-final { scan-assembler "DW_TAG_typedef\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*DW_AT_name: \"Harry_t\"" } } */ +/* { dg-final { scan-assembler "DW_TAG_typedef\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*(DW_AT_name: \"Harry_t\"|\"Harry_t..\"\[^\\r\\n\]*DW_AT_name)" } } */ /* { dg-final { cleanup-saved-temps } } */ diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-2.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-2.c --- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-2.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-2.c @@ -4,5 +4,5 @@ typedef const struct _Harry { int dummy; } Harry_t; Harry_t harry; -/* { dg-final { scan-assembler "DW_TAG_typedef\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*DW_AT_name: \"Harry_t\"" } } */ +/* { dg-final { scan-assembler "DW_TAG_typedef\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*(DW_AT_name: \"Harry_t\"|\"Harry_t..\"\[^\\r\\n\]*DW_AT_name)" } } */ /* { dg-final { cleanup-saved-temps } } */ diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-3.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-3.c --- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-3.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-3.c @@ -4,5 +4,5 @@ typedef struct _Harry { int dummy; } Harry_t; const Harry_t harry[5]; -/* { dg-final { scan-assembler "DW_TAG_typedef\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*DW_AT_name: \"Harry_t\"" } } */ +/* { dg-final { scan-assembler "DW_TAG_typedef\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*(DW_AT_name: \"Harry_t\"|\"Harry_t..\"\[^\\r\\n\]*DW_AT_name)" } } */ /* { dg-final { cleanup-saved-temps } } */ diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-4.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-4.c --- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-4.c +++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-4.c @@ -4,5 +4,5 @@ typedef const struct _Harry { int dummy; } Harry_t; Harry_t harry[10]; -/* { dg-final { scan-assembler "DW_TAG_typedef\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*DW_AT_name: \"Harry_t\"" } } */ +/* { dg-final { scan-assembler "DW_TAG_typedef\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*(DW_AT_name: \"Harry_t\"|\"Harry_t..\"\[^\\r\\n\]*DW_AT_name)" } } */ /* { dg-final { cleanup-saved-temps } } */