From patchwork Wed Dec 23 10:41:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 560437 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BBC03140BF5 for ; Wed, 23 Dec 2015 21:41:56 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=aFthYGrS; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:in-reply-to:references:date:message-id:mime-version :content-type; q=dns; s=default; b=oXlmOl2LlkY3z+Srx6akIMgQ4IRct kAp90N2G2ZfxmYOjHpeePnzPlAkfc4ydKM66MRgIOO2WGOav7tYzC0lfkqVmKLas G95+/7hJJmAPdnFECkb/YX/iDCY96SydpnCWzJXU2Tm2c4T+0sHF5xzFndZmySAp OxpLLuB1BSDEg8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:in-reply-to:references:date:message-id:mime-version :content-type; s=default; bh=OvlSvhaiqWTZiAUz7/HByMHVNt4=; b=aFt hYGrSTxyG/aiTWbNLXdZ3u3awFNm4tXxuLuDAxekVI5EfMrDVH92u0slTDYzlu5J oeReMauPvXHQaAHz1HtyJ4Evc4RUGHcGoqDr+IljhmBaACUTbjD1DbvuvmQ+dLop cy6B5LVzZ0k+SDFVVZVpBUdlTdkty0uCPig47I1M= Received: (qmail 50246 invoked by alias); 23 Dec 2015 10:41:49 -0000 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 Received: (qmail 50235 invoked by uid 89); 23 Dec 2015 10:41:49 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: =?ISO-8859-1?Q?No, score=-2.1 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=H*r:Wed, gr=c3=bc=c3, 456, Hx-languages-length:1959?= X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 23 Dec 2015 10:41:47 +0000 Received: from svr-orw-fem-03.mgc.mentorg.com ([147.34.97.39]) by relay1.mentorg.com with esmtp id 1aBgrY-0001zN-CJ from Thomas_Schwinge@mentor.com for gcc-patches@gcc.gnu.org; Wed, 23 Dec 2015 02:41:44 -0800 Received: from tftp-cs (147.34.91.1) by svr-orw-fem-03.mgc.mentorg.com (147.34.97.39) with Microsoft SMTP Server id 14.3.224.2; Wed, 23 Dec 2015 02:41:44 -0800 Received: by tftp-cs (Postfix, from userid 49978) id 5762AC23E3; Wed, 23 Dec 2015 02:41:43 -0800 (PST) From: Thomas Schwinge To: Subject: Don't run OpenACC C++ test twice (was: [gomp4] OpenACC / C++) In-Reply-To: <87lhobt58a.fsf@schwinge.name> References: <543E9EF1.7040108@codesourcery.com> <5319AF79.3020808@samsung.com> <87a94vncds.fsf@kepler.schwinge.homeip.net> <87lhobt58a.fsf@schwinge.name> User-Agent: Notmuch/0.9-125-g4686d11 (http://notmuchmail.org) Emacs/24.5.1 (i586-pc-linux-gnu) Date: Wed, 23 Dec 2015 11:41:34 +0100 Message-ID: <87y4clh2g1.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Mon, 20 Oct 2014 12:17:41 +0200, I wrote: > I have just applied in r216456: »Enable compiler testing > for OpenACC/C++«. > * g++.dg/goacc-gomp/goacc-gomp.exp: New file. > * g++.dg/goacc/goacc.exp: Likewise. I failed to realize that g++.dg/dg.exp has a "catch all" rule, and to avoid running the OpenACC tests twice, I applied the following, as obvious, in r231925: commit a1393a2ae7831f6af9876f125e1f508a92e39c1d Author: tschwinge Date: Wed Dec 23 10:39:58 2015 +0000 Don't run OpenACC C++ test twice gcc/testsuite/ * g++.dg/dg.exp (tests): Prune "goacc/*" and "goacc-gomp/*" files. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231925 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/g++.dg/dg.exp | 2 ++ 2 files changed, 6 insertions(+) Grüße Thomas diff --git gcc/testsuite/ChangeLog gcc/testsuite/ChangeLog index 0620068..1924c24 100644 --- gcc/testsuite/ChangeLog +++ gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2015-12-23 Thomas Schwinge + + * g++.dg/dg.exp (tests): Prune "goacc/*" and "goacc-gomp/*" files. + 2015-12-23 David Sherwood * gcc.target/arm/fmaxmin.x: New file used by tests below. diff --git gcc/testsuite/g++.dg/dg.exp gcc/testsuite/g++.dg/dg.exp index b77c3c5..570a818 100644 --- gcc/testsuite/g++.dg/dg.exp +++ gcc/testsuite/g++.dg/dg.exp @@ -45,6 +45,8 @@ set tests [prune $tests $srcdir/$subdir/plugin/*] set tests [prune $tests $srcdir/$subdir/special/*] set tests [prune $tests $srcdir/$subdir/tls/*] set tests [prune $tests $srcdir/$subdir/vect/*] +set tests [prune $tests $srcdir/$subdir/goacc/*] +set tests [prune $tests $srcdir/$subdir/goacc-gomp/*] set tests [prune $tests $srcdir/$subdir/gomp/*] set tests [prune $tests $srcdir/$subdir/tree-prof/*] set tests [prune $tests $srcdir/$subdir/torture/*]