From patchwork Fri Sep 21 02:51:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janis Johnson X-Patchwork-Id: 185552 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 AB9BC2C008A for ; Fri, 21 Sep 2012 12:52:08 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1348800731; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Message-ID:Date:From:Reply-To:User-Agent:MIME-Version: To:Subject:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=F7ChCCKBMBUzQprFsrOpQqkMyAI=; b=x6gDWKI9fBhv7fz +erYmCKkdS7R+6e/922s3Z9U4B6rNYPmyRNLGR+tkS2Nil8GIEG5s79e/7u00hbv JcgrPK67/3m6Fd2pWsU5E0UMoc4h2aaYZkCSVwM33k2fipRSRmbMa6Mqbi8CO99c z3zzgVYoyEu/imHI1pYu1xZNq0TI= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:Message-ID:Date:From:Reply-To:User-Agent:MIME-Version:To:Subject:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=QWrdBPPNtctf4SIMrlmu34gzkC84lgTKqIJ7cdqACFuEOmveLrJLtAjTgB8+lz f62+gsbuNYq/ilsIdgB8DYRIItBI3nnUZ+1jhuUMShHgpnzGFG5dfSpL1QbXJZhG +66x6XbIjXn6xHv2qwBOnzXKFNyNRS2CpDSUcZG0YFdyI=; Received: (qmail 927 invoked by alias); 21 Sep 2012 02:52:03 -0000 Received: (qmail 918 invoked by uid 22791); 21 Sep 2012 02:52:02 -0000 X-SWARE-Spam-Status: No, hits=-3.8 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_HOSTKARMA_W, RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 21 Sep 2012 02:51:48 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1TEtLG-0001wV-JB from Janis_Johnson@mentor.com for gcc-patches@gcc.gnu.org; Thu, 20 Sep 2012 19:51:46 -0700 Received: from SVR-ORW-FEM-05.mgc.mentorg.com ([147.34.97.43]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 20 Sep 2012 19:51:46 -0700 Received: from [127.0.0.1] (147.34.91.1) by svr-orw-fem-05.mgc.mentorg.com (147.34.97.43) with Microsoft SMTP Server id 14.1.289.1; Thu, 20 Sep 2012 19:51:45 -0700 Message-ID: <505BD633.5090209@mentor.com> Date: Thu, 20 Sep 2012 19:51:31 -0700 From: Janis Johnson Reply-To: User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.28) Gecko/20120313 Thunderbird/3.1.20 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" Subject: [testsuite] gcc.target/arm: skip 5 tests for flag conflicts 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 This patch adds test directives to skip 5 tests in gcc.target/arm if the flags specified for the test would be overridden by or conflict with flags used for all tests, such as multilib flags. Tested on arm-none-eabi with a variety of test flags. I'll wait a day or two before checking it in to give ARM experts a chance to comment. I plan to backport to the 4.7 branch soon after it's in trunk. Janis 2012-09-20 Janis Johnson * gcc.target/arm/pr40887.c: Avoid conflicting flags. * gcc.target/arm/pr51835.c: Likewise. * gcc.target/arm/pr51915.c: Likewise. * gcc.target/arm/pr52006.c: Likewise. * gcc.target/arm/pr53187.c: Likewise. Index: gcc.target/arm/pr40887.c =================================================================== --- gcc.target/arm/pr40887.c (revision 191502) +++ gcc.target/arm/pr40887.c (working copy) @@ -1,3 +1,4 @@ +/* { dg-skip-if " do not override -march" { *-*-* } { "-march=*" } { "-march=armv5te" } } */ /* { dg-options "-O2 -march=armv5te" } */ /* { dg-final { scan-assembler "blx" } } */ Index: gcc.target/arm/pr51835.c =================================================================== --- gcc.target/arm/pr51835.c (revision 191502) +++ gcc.target/arm/pr51835.c (working copy) @@ -1,6 +1,8 @@ /* { dg-do compile } */ +/* { dg-require-effective-target arm_thumb2_ok } */ +/* { dg-skip-if "do not override -mfloat-abi" { *-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=hard" } } */ +/* { dg-skip-if "do not override -mfpu" { *-*-* } { "-mfpu=*" } { "-mfpu=fpv4-sp-d16" } } */ /* { dg-options "-O2 -mfloat-abi=hard -mfpu=fpv4-sp-d16" } */ -/* { dg-require-effective-target arm_thumb2_ok } */ int func1 (double d) { Index: gcc.target/arm/pr51915.c =================================================================== --- gcc.target/arm/pr51915.c (revision 191502) +++ gcc.target/arm/pr51915.c (working copy) @@ -1,5 +1,7 @@ /* PR target/51915 */ /* { dg-do compile } */ +/* { dg-skip-if "do not override -march" { *-*-* } { "-march=*" } { "-march=armv7-a" } } */ +/* { dg-skip-if "do not override -mfloat-abi" { *-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=hard" } } */ /* { dg-options "-march=armv7-a -mfloat-abi=hard -O2" } */ struct S { int s1; void *s2; }; Index: gcc.target/arm/pr52006.c =================================================================== --- gcc.target/arm/pr52006.c (revision 191502) +++ gcc.target/arm/pr52006.c (working copy) @@ -1,5 +1,7 @@ /* PR target/52006 */ /* { dg-do compile } */ +/* { dg-skip-if "do not override -march=" { *-*-* } { "-march=*" } { "-march=armv7-a" } } */ +/* { dg-skip-if "do not override -mfloat-abi" { *-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=hard" } } */ /* { dg-options "-march=armv7-a -mfloat-abi=hard -O2 -fPIC" } */ unsigned long a; Index: gcc.target/arm/pr53187.c =================================================================== --- gcc.target/arm/pr53187.c (revision 191502) +++ gcc.target/arm/pr53187.c (working copy) @@ -1,5 +1,6 @@ /* PR target/53187 */ /* { dg-do compile } */ +/* { dg-skip-if "do not override -march" { *-*-* } { "-march=*" } { "-march=armv7-a" } } */ /* { dg-options "-march=armv7-a -mfloat-abi=hard -O2" } */ void bar (int);