Message ID | 87lhw5f9to.fsf@schwinge.name |
---|---|
State | New |
Headers | show |
On Thu, Mar 20, 2014 at 11:22:59AM +0100, Thomas Schwinge wrote: > > --- /dev/null > > +++ b/gcc/testsuite/gfortran.dg/goacc/coarray.f95 > > @@ -0,0 +1,35 @@ > > +! { dg-do compile } > > > +! { dg-excess-errors "Unimplemented" } > > +! { dg-excess-errors "ACC LOOP" } > > \ No newline at end of file Note, in any case, please avoid files without trailing newline unless strictly necessary (primarily, testing that compiler handles those). Jakub
Hi Thomas! On 20.03.2014 14:22, Thomas Schwinge wrote: > > As in > <http://news.gmane.org/find-root.php?message_id=%3C87mwglf9vq.fsf%40schwinge.name%3E>, > this is wrong usage of the dg-excess-errors directive, for this one will > absorb *all* remaining errors, whereas you just wanted to mask out any > »sorry, unimplemented: [...]« ones. > > OK to fix as follows? > Sure. Thanks!
diff --git gcc/testsuite/gfortran.dg/goacc/cache-1.f95 gcc/testsuite/gfortran.dg/goacc/cache-1.f95 index 6d7f60a..746cf02 100644 --- gcc/testsuite/gfortran.dg/goacc/cache-1.f95 +++ gcc/testsuite/gfortran.dg/goacc/cache-1.f95 @@ -9,4 +9,4 @@ program test !$acc cache (d) enddo end -! { dg-excess-errors "unimplemented" } \ No newline at end of file +! { dg-prune-output "unimplemented" } diff --git gcc/testsuite/gfortran.dg/goacc/coarray.f95 gcc/testsuite/gfortran.dg/goacc/coarray.f95 index 7afb4bc..ab13157 100644 --- gcc/testsuite/gfortran.dg/goacc/coarray.f95 +++ gcc/testsuite/gfortran.dg/goacc/coarray.f95 @@ -31,5 +31,4 @@ contains !$acc update device (a) end subroutine oacc1 end module test -! { dg-excess-errors "Unimplemented" } -! { dg-excess-errors "ACC LOOP" } \ No newline at end of file +! { dg-prune-output "ACC cache unimplemented" } diff --git gcc/testsuite/gfortran.dg/goacc/cray.f95 gcc/testsuite/gfortran.dg/goacc/cray.f95 index 509f61b..3225b28 100644 --- gcc/testsuite/gfortran.dg/goacc/cray.f95 +++ gcc/testsuite/gfortran.dg/goacc/cray.f95 @@ -51,4 +51,4 @@ contains !$acc update device (ptr) end subroutine oacc1 end module test -! { dg-excess-errors "unimplemented" } \ No newline at end of file +! { dg-prune-output "unimplemented" } diff --git gcc/testsuite/gfortran.dg/goacc/data-tree.f95 gcc/testsuite/gfortran.dg/goacc/data-tree.f95 index d29c060..a5c012a 100644 --- gcc/testsuite/gfortran.dg/goacc/data-tree.f95 +++ gcc/testsuite/gfortran.dg/goacc/data-tree.f95 @@ -12,7 +12,7 @@ program test !$acc end data end program test -! { dg-excess-errors "unimplemented" } +! { dg-prune-output "unimplemented" } ! { dg-final { scan-tree-dump-times "pragma acc data" 1 "original" } } ! { dg-final { scan-tree-dump-times "if" 1 "original" } } @@ -28,4 +28,4 @@ end program test ! { dg-final { scan-tree-dump-times "map\\(alloc:t\\)" 1 "original" } } ! { dg-final { scan-tree-dump-times "map\\(force_deviceptr:u\\)" 1 "original" } } -! { dg-final { cleanup-tree-dump "original" } } \ No newline at end of file +! { dg-final { cleanup-tree-dump "original" } } diff --git gcc/testsuite/gfortran.dg/goacc/declare-1.f95 gcc/testsuite/gfortran.dg/goacc/declare-1.f95 index aec3ae8..03540f1 100644 --- gcc/testsuite/gfortran.dg/goacc/declare-1.f95 +++ gcc/testsuite/gfortran.dg/goacc/declare-1.f95 @@ -15,6 +15,6 @@ contains END BLOCK end function foo end program test -! { dg-excess-errors "unimplemented" } +! { dg-prune-output "unimplemented" } ! { dg-final { scan-tree-dump-times "pragma acc declare map\\(force_tofrom:i\\)" 2 "original" } } ! { dg-final { cleanup-tree-dump "original" } } diff --git gcc/testsuite/gfortran.dg/goacc/host_data-tree.f95 gcc/testsuite/gfortran.dg/goacc/host_data-tree.f95 index 1c24fe7..19e7411 100644 --- gcc/testsuite/gfortran.dg/goacc/host_data-tree.f95 +++ gcc/testsuite/gfortran.dg/goacc/host_data-tree.f95 @@ -8,6 +8,6 @@ program test !$acc host_data use_device(i) !$acc end host_data end program test -! { dg-excess-errors "unimplemented" } +! { dg-prune-output "unimplemented" } ! { dg-final { scan-tree-dump-times "pragma acc host_data use_device\\(i\\)" 1 "original" } } ! { dg-final { cleanup-tree-dump "original" } } diff --git gcc/testsuite/gfortran.dg/goacc/kernels-tree.f95 gcc/testsuite/gfortran.dg/goacc/kernels-tree.f95 index 5c65d2a..73f172c 100644 --- gcc/testsuite/gfortran.dg/goacc/kernels-tree.f95 +++ gcc/testsuite/gfortran.dg/goacc/kernels-tree.f95 @@ -12,7 +12,7 @@ program test !$acc end kernels end program test -! { dg-excess-errors "unimplemented" } +! { dg-prune-output "unimplemented" } ! { dg-final { scan-tree-dump-times "pragma acc kernels" 1 "original" } } ! { dg-final { scan-tree-dump-times "if" 1 "original" } } diff --git gcc/testsuite/gfortran.dg/goacc/loop-1.f95 gcc/testsuite/gfortran.dg/goacc/loop-1.f95 index af4f537..e1b2dfd 100644 --- gcc/testsuite/gfortran.dg/goacc/loop-1.f95 +++ gcc/testsuite/gfortran.dg/goacc/loop-1.f95 @@ -167,4 +167,5 @@ subroutine test1 end subroutine test1 end module test -! { dg-excess-errors "Deleted" } +! { dg-prune-output "Deleted" } +! { dg-prune-output "ACC cache unimplemented" } diff --git gcc/testsuite/gfortran.dg/goacc/parallel-kernels-regions.f95 gcc/testsuite/gfortran.dg/goacc/parallel-kernels-regions.f95 index 5cd4d6c..f31aa54 100644 --- gcc/testsuite/gfortran.dg/goacc/parallel-kernels-regions.f95 +++ gcc/testsuite/gfortran.dg/goacc/parallel-kernels-regions.f95 @@ -53,4 +53,4 @@ program test !$acc end kernels end program test -! { dg-excess-errors "unimplemented" } \ No newline at end of file +! { dg-prune-output "error: may not be nested" } diff --git gcc/testsuite/gfortran.dg/goacc/parallel-tree.f95 gcc/testsuite/gfortran.dg/goacc/parallel-tree.f95 index a92de4e..f004702 100644 --- gcc/testsuite/gfortran.dg/goacc/parallel-tree.f95 +++ gcc/testsuite/gfortran.dg/goacc/parallel-tree.f95 @@ -15,7 +15,7 @@ program test !$acc end parallel end program test -! { dg-excess-errors "unimplemented" } +! { dg-prune-output "unimplemented" } ! { dg-final { scan-tree-dump-times "pragma acc parallel" 1 "original" } } ! { dg-final { scan-tree-dump-times "if" 1 "original" } } diff --git gcc/testsuite/gfortran.dg/goacc/parameter.f95 gcc/testsuite/gfortran.dg/goacc/parameter.f95 index 917f772..785d7f9 100644 --- gcc/testsuite/gfortran.dg/goacc/parameter.f95 +++ gcc/testsuite/gfortran.dg/goacc/parameter.f95 @@ -28,4 +28,4 @@ contains !$acc update device (a) ! { dg-error "not a variable" } end subroutine oacc1 end module test -! { dg-excess-errors "unimplemented" } \ No newline at end of file +! { dg-prune-output "unimplemented" }