From patchwork Thu Oct 29 09:06:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 537735 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 EAC2C140787 for ; Thu, 29 Oct 2015 20:06:27 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=fR9MRoST; 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:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; q=dns; s=default; b=c+eTdiG/26UWdeaF NQRw+y9gACz0/OHrHaZvoLXElXL2fNq6I3AlkpXAyDb5SfOAmw0LGFImCSpOZ5mD LP1MjfJrHpEXjH/kWR2NpMTbvu0zsqJ7FVA08//GyeCuVqf5BOlRRAtmuCDLmKKz 25XbBaEFiS8unihqbUxxXiUfjZk= 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:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=default; bh=GdoQtBO1JYt29vsxbWDoei p6Z5E=; b=fR9MRoSTc9XHcmlXl/vr9vdBko0spFDIkidUmZb2WG2V9mL8SaMetL Ma7l7v2HwcVTMdGaGcf0K83kbqmVLn9aJbfQNYS3oCADP65fc+MNXfp1ZSjAs+vb xicnKRP7WBn3q0xeRkJYPS20f6Sx20CoGj2QKw+h8p2TM1jv0XNpE= Received: (qmail 66907 invoked by alias); 29 Oct 2015 09:06:18 -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 66897 invoked by uid 89); 29 Oct 2015 09:06:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 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; Thu, 29 Oct 2015 09:06:16 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-03.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1Zrj9x-0000Ug-Ei from Thomas_Schwinge@mentor.com ; Thu, 29 Oct 2015 02:06:13 -0700 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-03.mgc.mentorg.com (137.202.0.108) with Microsoft SMTP Server id 14.3.224.2; Thu, 29 Oct 2015 09:06:12 +0000 From: Thomas Schwinge To: "gcc-patches@gcc.gnu.org" CC: Cesar Philippidis , Jakub Jelinek , james norris Subject: Improve filenames for test cases of OpenACC combined directives (was: [gomp4] fortran cleanups and c/c++ loop parsing backport) In-Reply-To: <874mha59zh.fsf@schwinge.name> References: <562FC41A.4030308@codesourcery.com> <87vb9r45qw.fsf@kepler.schwinge.homeip.net> <5630EA30.8080908@codesourcery.com> <874mha59zh.fsf@schwinge.name> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Thu, 29 Oct 2015 10:06:10 +0100 Message-ID: <871tce59j1.fsf@schwinge.name> MIME-Version: 1.0 Hi! On Thu, 29 Oct 2015 09:56:18 +0100, I wrote: > On Wed, 28 Oct 2015 08:30:56 -0700, Cesar Philippidis wrote: > > On 10/28/2015 04:00 AM, Thomas Schwinge wrote: > > > On Tue, 27 Oct 2015 11:36:10 -0700, Cesar Philippidis wrote: > > > With... > > > > > >> --- /dev/null > > >> +++ b/gcc/testsuite/gfortran.dg/goacc/combined-directives.f90 > > > > > > ... newly added, and... > > > > > >> --- a/libgomp/testsuite/libgomp.oacc-fortran/combdir-1.f90 > > >> +++ /dev/null > > > > > > ... renamed to... > > > > > >> --- /dev/null > > >> +++ b/libgomp/testsuite/libgomp.oacc-fortran/combined-directive-1.f90 > > > > > > ... this, plus the unaltered > > > libgomp/testsuite/libgomp.oacc-c-c++-common/combdir-1.c, we now got three > > > variants: "combined-directives", "combined-directive", and "combdir". > > > Please settle on one of them. > > > > The problem here was I didn't know what compdir stood for > > *Comb*ined *dir*ectives, I guessed. > > > so I renamed > > it to combined-directive-foo. I guess I didn't keep the name consistent > > when I introduced a new compiler time test. The attached patch adjusts > > the test in libgomp to make it consistent with it's compile time test. > > Again, to not make merges needlessly difficult, the preference is to do > such changes on trunk first. (Which I'll now do in the following, also > taking care to rename > libgomp/testsuite/libgomp.oacc-c-c++-common/combdir-1.c in the same > way...). As obvious, committed to trunk in r229518: commit e8ec2b06072a532b8d7319ed598ac1dad2584fea Author: tschwinge Date: Thu Oct 29 09:03:40 2015 +0000 Improve filenames for test cases of OpenACC combined directives libgomp/ * testsuite/libgomp.oacc-c-c++-common/combdir-1.c: Rename to... * testsuite/libgomp.oacc-c-c++-common/combined-directives-1.c: ... this. Add a description of the test at the top of the file. * testsuite/libgomp.oacc-fortran/combdir-1.f90: Rename file to... * testsuite/libgomp.oacc-fortran/combined-directives-1.f90: ... this. Add a description of the test at the top of the file. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@229518 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgomp/ChangeLog | 10 ++++++++++ .../{combdir-1.c => combined-directives-1.c} | 2 ++ .../{combdir-1.f90 => combined-directives-1.f90} | 2 ++ 3 files changed, 14 insertions(+) Grüße Thomas diff --git libgomp/ChangeLog libgomp/ChangeLog index 8f44af0..c78881b 100644 --- libgomp/ChangeLog +++ libgomp/ChangeLog @@ -1,3 +1,13 @@ +2015-10-29 Thomas Schwinge + Cesar Philippidis + + * testsuite/libgomp.oacc-c-c++-common/combdir-1.c: Rename to... + * testsuite/libgomp.oacc-c-c++-common/combined-directives-1.c: + ... this. Add a description of the test at the top of the file. + * testsuite/libgomp.oacc-fortran/combdir-1.f90: Rename file to... + * testsuite/libgomp.oacc-fortran/combined-directives-1.f90: + ... this. Add a description of the test at the top of the file. + 2015-10-28 Nathan Sidwell * testsuite/libgomp.oacc-c-c++-common/loop-g-1.c: New. diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/combdir-1.c libgomp/testsuite/libgomp.oacc-c-c++-common/combined-directives-1.c similarity index 93% rename from libgomp/testsuite/libgomp.oacc-c-c++-common/combdir-1.c rename to libgomp/testsuite/libgomp.oacc-c-c++-common/combined-directives-1.c index a7def92..dad6d13 100644 --- libgomp/testsuite/libgomp.oacc-c-c++-common/combdir-1.c +++ libgomp/testsuite/libgomp.oacc-c-c++-common/combined-directives-1.c @@ -1,3 +1,5 @@ +/* This test exercises combined directives. */ + /* { dg-do run } */ #include diff --git libgomp/testsuite/libgomp.oacc-fortran/combdir-1.f90 libgomp/testsuite/libgomp.oacc-fortran/combined-directives-1.f90 similarity index 92% rename from libgomp/testsuite/libgomp.oacc-fortran/combdir-1.f90 rename to libgomp/testsuite/libgomp.oacc-fortran/combined-directives-1.f90 index 0cd8a67..94100b2 100644 --- libgomp/testsuite/libgomp.oacc-fortran/combdir-1.f90 +++ libgomp/testsuite/libgomp.oacc-fortran/combined-directives-1.f90 @@ -1,3 +1,5 @@ +! This test exercises combined directives. + ! { dg-do run } program main