diff options
author | Tom de Vries <tom@codesourcery.com> | 2017-04-28 21:52:16 +0000 |
---|---|---|
committer | Tom de Vries <vries@gcc.gnu.org> | 2017-04-28 21:52:16 +0000 |
commit | c961093393e427bce36172d6b3d0348af403cd96 (patch) | |
tree | fb4d66ea921b2d87bb9f8add9307b41f02ee328a /gcc | |
parent | b5be38bc30107969515bed284c65e39efe978af2 (diff) | |
download | gcc-c961093393e427bce36172d6b3d0348af403cd96.zip gcc-c961093393e427bce36172d6b3d0348af403cd96.tar.gz gcc-c961093393e427bce36172d6b3d0348af403cd96.tar.bz2 |
Replace absolute linenrs in gfortran.dg
2017-04-28 Tom de Vries <tom@codesourcery.com>
PR testsuite/80557
* gfortran.dg/gomp/appendix-a/a.24.1.f90: Replace absolute linenrs.
* gfortran.dg/gomp/appendix-a/a.31.3.f90: Same.
From-SVN: r247400
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/gomp/appendix-a/a.24.1.f90 | 6 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/gomp/appendix-a/a.31.3.f90 | 26 |
3 files changed, 21 insertions, 17 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 589da6d..3e1b995 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,12 @@ 2017-04-28 Tom de Vries <tom@codesourcery.com> PR testsuite/80557 + * gfortran.dg/gomp/appendix-a/a.24.1.f90: Replace absolute linenrs. + * gfortran.dg/gomp/appendix-a/a.31.3.f90: Same. + +2017-04-28 Tom de Vries <tom@codesourcery.com> + + PR testsuite/80557 * obj-c++.dg/bitfield-1.mm: Replace absolute linenrs. * obj-c++.dg/bitfield-4.mm: Same. * obj-c++.dg/bitfield-5.mm: Same. diff --git a/gcc/testsuite/gfortran.dg/gomp/appendix-a/a.24.1.f90 b/gcc/testsuite/gfortran.dg/gomp/appendix-a/a.24.1.f90 index 802577b..52a2cbb 100644 --- a/gcc/testsuite/gfortran.dg/gomp/appendix-a/a.24.1.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/appendix-a/a.24.1.f90 @@ -11,7 +11,7 @@ !$OMP THREADPRIVATE(/BLOCKX/) INTEGER I, J i=1 -!$OMP PARALLEL DEFAULT(NONE) PRIVATE(A) SHARED(Z) PRIVATE(J) +!$OMP PARALLEL DEFAULT(NONE) PRIVATE(A) SHARED(Z) PRIVATE(J) ! { dg-line omp_parallel } J = OMP_GET_NUM_THREADS(); ! O.K. - J is listed in PRIVATE clause A = Z(J) ! O.K. - A is listed in PRIVATE clause @@ -19,8 +19,8 @@ X=1 ! O.K. - X is THREADPRIVATE Z(I) = Y ! Error - cannot reference I or Y here ! { dg-error "'i' not specified" "" { target *-*-* } .-1 } */ -! { dg-error "enclosing 'parallel'" "" { target *-*-* } 14 } */ -! { dg-error "'y' not specified" "" { target *-*-* } 20 } */ +! { dg-error "enclosing 'parallel'" "" { target *-*-* } omp_parallel } */ +! { dg-error "'y' not specified" "" { target *-*-* } .-3 } */ !$OMP DO firstprivate(y) DO I = 1,10 Z(I) = Y ! O.K. - I is the loop iteration variable diff --git a/gcc/testsuite/gfortran.dg/gomp/appendix-a/a.31.3.f90 b/gcc/testsuite/gfortran.dg/gomp/appendix-a/a.31.3.f90 index 598c904..7de656a 100644 --- a/gcc/testsuite/gfortran.dg/gomp/appendix-a/a.31.3.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/appendix-a/a.31.3.f90 @@ -1,15 +1,13 @@ ! { dg-do compile } - PROGRAM A31_3_WRONG - MAX = HUGE(0) - M=0 - !$OMP PARALLEL DO REDUCTION(MAX: M) ! MAX is no longer the - ! intrinsic so this - ! is non-conforming -! { dg-error "OMP DECLARE REDUCTION max not found" "" { target *-*-* } 5 } */ - DO I = 1, 100 - CALL SUB(M,I) - END DO - END PROGRAM A31_3_WRONG - SUBROUTINE SUB(M,I) - M = MAX(M,I) - END SUBROUTINE SUB +PROGRAM A31_3_WRONG + MAX = HUGE(0) + M=0 + !$OMP PARALLEL DO REDUCTION(MAX: M) ! MAX is no longer the intrinsic so this is non-conforming + ! { dg-error "OMP DECLARE REDUCTION max not found" "" { target *-*-* } .-1 } */ + DO I = 1, 100 + CALL SUB(M,I) + END DO +END PROGRAM A31_3_WRONG +SUBROUTINE SUB(M,I) + M = MAX(M,I) +END SUBROUTINE SUB |