[fortran, committed] PR 54474 assumed rank testsuite fix (was: Re: [Patch, Fortran, committed] Fix PR54467 (TBP ICEs due to _final wrapper disabling))

[Mikael Morin]

On 04/09/2012 00:19, Dominique Dhumieres wrote:
> Hi Tobias,
> 
> The lines 6 and 12 of gfortran.dg/coarray_poly_3.f90 need some adjustment
> along the line:

For what's worth, the testsuite change was part of patch (b) at
http://gcc.gnu.org/ml/fortran/2012-08/msg00201.html
while it should have been part of patch (a), (or the corresponding
frontend change should have been part of patch (b)).

Anyway, I committed it (revision 190977).

Mikael

Index: gfortran.dg/coarray_poly_3.f90
===================================================================
--- gfortran.dg/coarray_poly_3.f90	(révision 190976)
+++ gfortran.dg/coarray_poly_3.f90	(révision 190977)
@@ -3,13 +3,13 @@
 !
 
 
-subroutine cont1(x) ! { dg-error "has the CONTIGUOUS attribute but is not an array pointer or an assumed-shape array" }
+subroutine cont1(x) ! { dg-error "has the CONTIGUOUS attribute but is not an array pointer or an assumed-shape or assumed-rank array" }
   type t
   end type t
   class(t), contiguous, allocatable :: x(:)
 end
 
-subroutine cont2(x) ! { dg-error "has the CONTIGUOUS attribute but is not an array pointer or an assumed-shape array" }
+subroutine cont2(x) ! { dg-error "has the CONTIGUOUS attribute but is not an array pointer or an assumed-shape or assumed-rank array" }
   type t
   end type t
   class(t), contiguous, allocatable :: x(:)[:]
Index: ChangeLog
===================================================================
--- ChangeLog	(révision 190976)
+++ ChangeLog	(révision 190977)
@@ -1,3 +1,8 @@
+2012-09-05  Dominique Dhumieres  <domi...@lps.ens.fr>
+
+	PR fortran/54474
+	* gfortran.dg/coarray_poly_3.f90: Adjust error messages.
+
 2012-09-05  Paolo Carlini  <paolo.carl...@oracle.com>
 
 	PR c++/54191