From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id 7CA24384B801; Tue, 1 Jun 2021 05:38:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7CA24384B801 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-11] gcc/testsuite/*/gomp/affinity*.{c, f90}: Avoid dg-note X-Act-Checkin: gcc X-Git-Author: Tobias Burnus X-Git-Refname: refs/heads/devel/omp/gcc-11 X-Git-Oldrev: 880b2839feaf759959844d91f89a55858185a964 X-Git-Newrev: ae0418b229bfdedaae7e3d456ed8a27d9233f032 Message-Id: <20210601053855.7CA24384B801@sourceware.org> Date: Tue, 1 Jun 2021 05:38:55 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jun 2021 05:38:55 -0000 https://gcc.gnu.org/g:ae0418b229bfdedaae7e3d456ed8a27d9233f032 commit ae0418b229bfdedaae7e3d456ed8a27d9233f032 Author: Tobias Burnus Date: Tue Jun 1 07:37:32 2021 +0200 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: --- gcc/testsuite/ChangeLog.omp | 6 ++++++ gcc/testsuite/c-c++-common/gomp/affinity-6.c | 6 +++--- gcc/testsuite/gfortran.dg/gomp/affinity-clause-4.f90 | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp index a90d829c6d0..cc7a00b5b2e 100644 --- a/gcc/testsuite/ChangeLog.omp +++ b/gcc/testsuite/ChangeLog.omp @@ -1,3 +1,9 @@ +2021-06-01 Tobias Burnus + + * 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 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 0c9cd59cccf..9d21c17e83a 100644 --- 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 0d07efd3f30..bd4eb6a8aa2 100644 --- 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