gcc/testsuite/*/gomp/affinity*.{c,f90}: Avoid dg-note

Contrary to mainline/GCC12, GCC 11 does not support dg-note.

gcc/testsuite/
        * c-c++-common/gomp/affinity-6.c: Use dg-message
        instead of dg-note.
        * gfortran.dg/gomp/affinity-clause-4.f90: Likewise.

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index a90d829c6d003946efc7a94463a9ff7f502e1425..cc7a00b5b2e325f7db56ace5bc31dc7805e7b65f 100644 (file)
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,9 @@
+2021-06-01  Tobias Burnus  <tobias@codesourcery.com>
+
+       * c-c++-common/gomp/affinity-6.c: Use dg-message
+       instead of dg-note.
+       * gfortran.dg/gomp/affinity-clause-4.f90: Likewise.
+
 2021-05-31  Tobias Burnus  <tobias@codesourcery.com>
 
        Backported from master:

diff --git a/gcc/testsuite/c-c++-common/gomp/affinity-6.c b/gcc/testsuite/c-c++-common/gomp/affinity-6.c
index 0c9cd59cccff68dfd619361877f3d3bcaee66c23..9d21c17e83a5a43a6eba10d9b14ee280be1086c2 100644 (file)
--- a/gcc/testsuite/c-c++-common/gomp/affinity-6.c
+++ b/gcc/testsuite/c-c++-common/gomp/affinity-6.c
@@ -5,7 +5,7 @@ int bar2 (int);
 void foobar()
 {
   int d[64], e[64], f[64];
-#pragma omp parallel default(none)  /* { dg-note "enclosing 'parallel'" }  */
+#pragma omp parallel default(none)  /* { dg-message "enclosing 'parallel'" }  */
 #pragma omp task affinity (d, e[bar(5)], f[4:10])
   ;
 /* { dg-error "'f' not specified in enclosing 'parallel'" "" { target *-*-* } .-2 }  */
@@ -17,7 +17,7 @@ void
 foo (void)
 {
   int a[64];
-#pragma omp parallel default(none)  /* { dg-note "enclosing 'parallel'" }  */
+#pragma omp parallel default(none)  /* { dg-message "enclosing 'parallel'" }  */
 #pragma omp task affinity (iterator (j=bar(0):bar(1):bar(2))  : a[bar(j)])
   ;
 /* { dg-error "'a' not specified in enclosing 'parallel'" "" { target *-*-* } .-2 }  */
@@ -27,7 +27,7 @@ void
 qux (void)
 {
   int a[64], b[64], c[64];
-#pragma omp parallel default(none)  /* { dg-note "enclosing 'parallel'" }  */
+#pragma omp parallel default(none)  /* { dg-message "enclosing 'parallel'" }  */
 #pragma omp task affinity (iterator (j=bar(0):bar(1):bar(2))  : a[bar(j+1)], b[bar(j+2)], c[bar(j+3)])
   ;
 /* { dg-error "'a' not specified in enclosing 'parallel'" "" { target *-*-* } .-2 }  */

diff --git a/gcc/testsuite/gfortran.dg/gomp/affinity-clause-4.f90 b/gcc/testsuite/gfortran.dg/gomp/affinity-clause-4.f90
index 0d07efd3f3012e756b206b48062728d67bb3bb56..bd4eb6a8aa2dcd9547761eb6820c57bef6d4bd60 100644 (file)
--- a/gcc/testsuite/gfortran.dg/gomp/affinity-clause-4.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/affinity-clause-4.f90
@@ -6,7 +6,7 @@ subroutine foo
     end function ibar
   end interface
 
-  !$omp parallel default(none)  ! { dg-note "enclosing 'parallel'" }
+  !$omp parallel default(none)  ! { dg-message "enclosing 'parallel'" }
   !$omp task affinity (iterator(j=ibar(0):ibar(1):ibar(2)) : a(ibar(j)), b(j), c(j))
   !$omp end task
   !$omp end parallel