gomp.exp: Recurse into subdirectories when looking for test source files.

gcc/testsuite/
	* g++.dg/gomp/gomp.exp: Recurse into subdirectories when looking
	for test source files.
	* gcc.dg/gomp/gomp.exp: Likewise.
	* gcc.dg/gomp/appendix-a/a.35.1.c: Expect error.
	* gcc.dg/gomp/appendix-a/a.35.3.c: Likewise.
	* gcc.dg/gomp/appendix-a/a.35.4.c: Likewise.
	* gcc.dg/gomp/appendix-a/a.35.5.c: Likewise.
	* gcc.dg/gomp/appendix-a/a.35.6.c: Likewise.

From-SVN: r203416

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c58d9ea7eec84d3c58ea9734f0a2a1074d0addd3..b06697bfe99359b91be8c7a2a5dfd1089b67f132 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2013-10-11  Thomas Schwinge  <thomas@codesourcery.com>
+
+       * g++.dg/gomp/gomp.exp: Recurse into subdirectories when looking
+       for test source files.
+       * gcc.dg/gomp/gomp.exp: Likewise.
+       * gcc.dg/gomp/appendix-a/a.35.1.c: Expect error.
+       * gcc.dg/gomp/appendix-a/a.35.3.c: Likewise.
+       * gcc.dg/gomp/appendix-a/a.35.4.c: Likewise.
+       * gcc.dg/gomp/appendix-a/a.35.5.c: Likewise.
+       * gcc.dg/gomp/appendix-a/a.35.6.c: Likewise.
+
 2013-10-11  Jakub Jelinek  <jakub@redhat.com>
 
        * c-c++-common/gomp/atomic-15.c: Adjust for C diagnostics.

diff --git a/gcc/testsuite/g++.dg/gomp/gomp.exp b/gcc/testsuite/g++.dg/gomp/gomp.exp
index d0199cb36f854b294ab0fdd75ecef68f5339603c..e783bdb05508e21a1d4d01e096fedc028984fc04 100644 (file)
--- a/gcc/testsuite/g++.dg/gomp/gomp.exp
+++ b/gcc/testsuite/g++.dg/gomp/gomp.exp
@@ -27,7 +27,9 @@ if ![check_effective_target_fopenmp] {
 dg-init
 
 # Main loop.
-g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C $srcdir/c-c++-common/gomp/*.c]] "-fopenmp"
+g++-dg-runtest [lsort [concat \
+       [find $srcdir/$subdir *.C] \
+       [find $srcdir/c-c++-common/gomp *.c]]] "-fopenmp"
 
 # All done.
 dg-finish

diff --git a/gcc/testsuite/gcc.dg/gomp/appendix-a/a.35.1.c b/gcc/testsuite/gcc.dg/gomp/appendix-a/a.35.1.c
index 4196b2d1521673f8b52496cbb2ca233c5da81e1f..f2c4a672fe4fb59affdae4374c7b671f419e887a 100644 (file)
--- a/gcc/testsuite/gcc.dg/gomp/appendix-a/a.35.1.c
+++ b/gcc/testsuite/gcc.dg/gomp/appendix-a/a.35.1.c
@@ -15,7 +15,7 @@ wrong1 (int n)
     for (i = 0; i < n; i++)
       {
        /* incorrect nesting of loop regions */
-#pragma omp for                /* { dg-warning "may not be closely nested" } */
+#pragma omp for                /* { dg-error "may not be closely nested" } */
        for (j = 0; j < n; j++)
          work (i, j);
       }

diff --git a/gcc/testsuite/gcc.dg/gomp/appendix-a/a.35.3.c b/gcc/testsuite/gcc.dg/gomp/appendix-a/a.35.3.c
index 31b2ddf0367e492e0f9043431c744dc15ec6fc09..64005b3074b9154bb146bca456d5488a03b4c1d9 100644 (file)
--- a/gcc/testsuite/gcc.dg/gomp/appendix-a/a.35.3.c
+++ b/gcc/testsuite/gcc.dg/gomp/appendix-a/a.35.3.c
@@ -12,7 +12,7 @@ wrong3 (int n)
     for (i = 0; i < n; i++)
       {
 /* incorrect nesting of regions */
-#pragma omp single     /* { dg-warning "may not be closely nested" } */
+#pragma omp single     /* { dg-error "may not be closely nested" } */
        work (i, 0);
       }
   }

diff --git a/gcc/testsuite/gcc.dg/gomp/appendix-a/a.35.4.c b/gcc/testsuite/gcc.dg/gomp/appendix-a/a.35.4.c
index d7579e6e7358e7bb7e2e25e8f85889d94921f29f..5bb6b80b396bd47cf2b0a4b3fe209d34dc5f1a55 100644 (file)
--- a/gcc/testsuite/gcc.dg/gomp/appendix-a/a.35.4.c
+++ b/gcc/testsuite/gcc.dg/gomp/appendix-a/a.35.4.c
@@ -11,7 +11,7 @@ wrong4 (int n)
       {
        work (i, 0);
        /* incorrect nesting of barrier region in a loop region */
-#pragma omp barrier    /* { dg-warning "may not be closely nested" } */
+#pragma omp barrier    /* { dg-error "may not be closely nested" } */
        work (i, 1);
       }
   }

diff --git a/gcc/testsuite/gcc.dg/gomp/appendix-a/a.35.5.c b/gcc/testsuite/gcc.dg/gomp/appendix-a/a.35.5.c
index 7b53015571ead0efcdb80d71295826ec26514a9c..7b4aee1c06b3d7be9e40fa5b5e8ddc483ab5de7a 100644 (file)
--- a/gcc/testsuite/gcc.dg/gomp/appendix-a/a.35.5.c
+++ b/gcc/testsuite/gcc.dg/gomp/appendix-a/a.35.5.c
@@ -9,7 +9,7 @@ wrong5 (int n)
     {
       work (n, 0);
 /* incorrect nesting of barrier region in a critical region */
-#pragma omp barrier
+#pragma omp barrier    /* { dg-error "may not be closely nested" } */
       work (n, 1);
     }
   }

diff --git a/gcc/testsuite/gcc.dg/gomp/appendix-a/a.35.6.c b/gcc/testsuite/gcc.dg/gomp/appendix-a/a.35.6.c
index ac850e5410a5e79dae584c69a2b8cf5f51b990c1..d18188b17523efefe8782e4cb86d8b007483e62b 100644 (file)
--- a/gcc/testsuite/gcc.dg/gomp/appendix-a/a.35.6.c
+++ b/gcc/testsuite/gcc.dg/gomp/appendix-a/a.35.6.c
@@ -9,7 +9,7 @@ wrong6 (int n)
     {
       work (n, 0);
 /* incorrect nesting of barrier region in a single region */
-#pragma omp barrier    /* { dg-warning "may not be closely nested" } */
+#pragma omp barrier    /* { dg-error "may not be closely nested" } */
       work (n, 1);
     }
   }

diff --git a/gcc/testsuite/gcc.dg/gomp/gomp.exp b/gcc/testsuite/gcc.dg/gomp/gomp.exp
index ca8aefd3c4e996417bf5241c49b1643ad93cb42d..cc2cd8ed089fd312a1267c5301057800349b7982 100644 (file)
--- a/gcc/testsuite/gcc.dg/gomp/gomp.exp
+++ b/gcc/testsuite/gcc.dg/gomp/gomp.exp
@@ -29,7 +29,9 @@ if ![check_effective_target_fopenmp] {
 dg-init
 
 # Main loop.
-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c $srcdir/c-c++-common/gomp/*.c]] "" "-fopenmp"
+dg-runtest [lsort [concat \
+       [find $srcdir/$subdir *.c] \
+       [find $srcdir/c-c++-common/gomp *.c]]] "" "-fopenmp"
 
 # All done.
 dg-finish