Improve filenames for test cases of OpenACC combined directives (was: [gomp4] fortran cleanups and c/c++ loop parsing backport)

[Thomas Schwinge <thomas at codesourcery dot com>]

Hi!

On Thu, 29 Oct 2015 09:56:18 +0100, I wrote:
> On Wed, 28 Oct 2015 08:30:56 -0700, Cesar Philippidis <cesar@codesourcery.com> wrote:
> > On 10/28/2015 04:00 AM, Thomas Schwinge wrote:
> > > On Tue, 27 Oct 2015 11:36:10 -0700, Cesar Philippidis <cesar@codesourcery.com> 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 <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
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(+)

diff --git libgomp/ChangeLog libgomp/ChangeLog
index 8f44af0..c78881b 100644
--- libgomp/ChangeLog
+++ libgomp/ChangeLog
@@ -1,3 +1,13 @@
+2015-10-29  Thomas Schwinge  <thomas@codesourcery.com>
+	    Cesar Philippidis  <cesar@codesourcery.com>
+
+	* 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  <nathan@codesourcery.com>
 
 	* 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 <stdlib.h>
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


GrÃÃe
 Thomas

Attachment: signature.asc
Description: PGP signature