From patchwork Tue Jan 4 14:06:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai Tietz X-Patchwork-Id: 77474 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 2FB7EB710A for ; Wed, 5 Jan 2011 01:07:00 +1100 (EST) Received: (qmail 10870 invoked by alias); 4 Jan 2011 14:06:55 -0000 Received: (qmail 10859 invoked by uid 22791); 4 Jan 2011 14:06:54 -0000 X-SWARE-Spam-Status: No, hits=-1.1 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RFC_ABUSE_POST X-Spam-Check-By: sourceware.org Received: from mail-qw0-f47.google.com (HELO mail-qw0-f47.google.com) (209.85.216.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 04 Jan 2011 14:06:49 +0000 Received: by qwg5 with SMTP id 5so14590858qwg.20 for ; Tue, 04 Jan 2011 06:06:47 -0800 (PST) MIME-Version: 1.0 Received: by 10.229.190.147 with SMTP id di19mr19263863qcb.209.1294150007362; Tue, 04 Jan 2011 06:06:47 -0800 (PST) Received: by 10.229.214.131 with HTTP; Tue, 4 Jan 2011 06:06:47 -0800 (PST) Date: Tue, 4 Jan 2011 15:06:47 +0100 Message-ID: Subject: [patch testsuite g++.dg]: Fix for windows targets dll(import/export)-MI1.C tests From: Kai Tietz To: GCC Patches 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 Hello, This patch fixes issues related about quoting in dllexport.C for cygwin/mingw 32-bit. Additionally it enables dllexport-MI1 and dllimport-MI1 test for 64-bit mingw, too. ChangeLog testsuite/ * g++.dg/ext/dllexport-MI1.C: Adjust test. * g++.dg/ext/dllimport-MI1.C: Likewise. Tested for i686-pc-cygwin, i686-w64-mingw32, and x86_64-w64-mingw32. Ok for apply? Regards, Kai Index: dllimport-MI1.C =================================================================== --- dllimport-MI1.C (revision 168457) +++ dllimport-MI1.C (working copy) @@ -1,4 +1,4 @@ -// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} } +// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } } // Test handling of MI thunks in dllimported classes. // To build the dll and client app: @@ -49,5 +49,5 @@ // Scan for import of explicit copy ctor for D2, but no import // of compiler generated copy ctor for D1. -// { dg-final { scan-assembler "__imp___ZN2D2C2ERKS_" } } -// { dg-final { scan-assembler-not "__imp___ZN2D1C2ERKS_" } } +// { dg-final { scan-assembler "__imp\[_\]*__ZN2D2C2ERKS_" } } +// { dg-final { scan-assembler-not "__imp\[_\]*__ZN2D1C2ERKS_" } } Index: dllexport-MI1.C =================================================================== --- dllexport-MI1.C (revision 168457) +++ dllexport-MI1.C (working copy) @@ -33,12 +33,12 @@ // and MI thunks, -// { dg-final { scan-assembler "-export:\[\\\\\"\]*_ZThn4_NK3MI12vfEv" } } -// { dg-final { scan-assembler "-export:\[\\\\\"\]*_ZTv0_n12_NK2D12vfEv" } } +// { dg-final { scan-assembler "-export:\[\\\\\"\]*_ZThn._NK3MI12vfEv" } } +// { dg-final { scan-assembler "-export:\[\\\\\"\]*_ZTv0_n.._NK2D12vfEv" } } // and a vtable data variable. -// { dg-final { scan-assembler "-export:\[\\\\\"\]*_ZTV2D1\[\\\"\]*,data" } } +// { dg-final { scan-assembler "-export:\[\\\\\"\]*_ZTV2D1\[\\\\\"\]*,data" } } // an explicit copy ctor // { dg-final { scan-assembler "-export:\[\\\\\"\]*_ZN2D2C2ERKS_" } }