Re: [Patch, Fortran testsuite, committed] Add/fix dg-final cleanup-module

[Mikael Morin]

On Tuesday 02 August 2011 18:01:35 Mikael Morin wrote:
> Thanks. I'll see if I have additional fixes after updating.
Here they are.
Tobias, I would like your input on lto/pr47839_{0,1}.f90 for which you put the 
cleanup directive for module pec_mod from pr47839_1.f90 in the  pr47839_0.f90 
file. As it seems to be an overlook, this patches changes it. Is that correct?

I have run the testsuite several times with these changes before updating, and 
will do it again before commiting. OK?

Mikael

2011-08-03  Mikael Morin  <mikael.mo...@sfr.fr>

        * gfortran.dg/pr32921.f: Add more dumps to cleanup.
        * gfortran.dg/lto/pr47839_0.f90: Move cleanup for module "pec_mod"...
        * gfortran.dg/lto/pr47839_1.f90: ... here.
        * gfortran.dg/dependency_26.f90: Add a module to the cleanup directive.
        * gfortran.dg/trim_optimize_2.f90: Add a module cleanup directive.
        * gfortran.dg/ldist-pr43023.f90: Ditto.
        * gfortran.dg/namelist_52.f90: Ditto.
        * gfortran.dg/interface_proc_end.f90: Ditto.
        * gfortran.dg/vector_subscript_bound_1.f90: Ditto.
        * gfortran.dg/generic_typebound_operator_1.f90: Ditto.

Index: trim_optimize_2.f90
===================================================================
--- trim_optimize_2.f90	(révision 177274)
+++ trim_optimize_2.f90	(copie de travail)
@@ -35,3 +35,4 @@
 ! { dg-final { scan-tree-dump-times "memmove" 4 "original" } }
 ! { dg-final { scan-tree-dump-times "string_trim" 0 "original" } }
 ! { dg-final { cleanup-tree-dump "original" } }
+! { dg-final { cleanup-modules "faz" } }
Index: dependency_26.f90
===================================================================
--- dependency_26.f90	(révision 177274)
+++ dependency_26.f90	(copie de travail)
@@ -47,7 +47,7 @@
   cell%h = reshape ([(real(i), i = 1, 9)], [3, 3])
   call s1 (cell)
 end
-! { dg-final { cleanup-modules "m1" } }
+! { dg-final { cleanup-modules "m1 m2" } }
 ! { dg-final { scan-tree-dump-times "&a" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "pack" 0 "original" } }
 ! { dg-final { cleanup-tree-dump "original" } }
Index: ldist-pr43023.f90
===================================================================
--- ldist-pr43023.f90	(révision 177274)
+++ ldist-pr43023.f90	(copie de travail)
@@ -29,3 +29,5 @@
 END SUBROUTINE NFT_Init
 
 END MODULE NFT_mod
+
+! { dg-final { cleanup-modules "nft_mod" } }
Index: namelist_52.f90
===================================================================
--- namelist_52.f90	(révision 177274)
+++ namelist_52.f90	(copie de travail)
@@ -30,3 +30,5 @@
 if (adjoint%solver_type /= 'direct') call abort
 if (adjoint%screen_io_fs_ntime%begin /= 42) call abort
 end program gfortran_error_2
+
+! { dg-final { cleanup-modules "mod1" } }
Index: lto/pr47839_0.f90
===================================================================
--- lto/pr47839_0.f90	(révision 177274)
+++ lto/pr47839_0.f90	(copie de travail)
@@ -7,4 +7,4 @@
 CONTAINS
 END MODULE globalvar_mod
 
-! { dg-final { cleanup-modules "globalvar_mod pec_mod" } }
+! { dg-final { cleanup-modules "globalvar_mod" } }
Index: lto/pr47839_1.f90
===================================================================
--- lto/pr47839_1.f90	(révision 177274)
+++ lto/pr47839_1.f90	(copie de travail)
@@ -5,3 +5,5 @@
 real(kind=8), dimension(1:xstop), intent(inout) :: Ex
 END SUBROUTINE PECapply
 END MODULE PEC_mod
+
+! { dg-final { cleanup-modules "pec_mod" } }
Index: pr32921.f
===================================================================
--- pr32921.f	(révision 177274)
+++ pr32921.f	(copie de travail)
@@ -46,5 +46,5 @@
       RETURN
       END
 ! { dg-final { scan-tree-dump-times "stride" 4 "lim1" } }
-! { dg-final { cleanup-tree-dump "lim1" } }
+! { dg-final { cleanup-tree-dump "lim\[1-3\]" } }
 ! { dg-final { cleanup-modules "les3d_data" } }
Index: interface_proc_end.f90
===================================================================
--- interface_proc_end.f90	(révision 177274)
+++ interface_proc_end.f90	(copie de travail)
@@ -16,3 +16,5 @@
       END INTERFACE
       end subroutine
       end module
+
+! { dg-final { cleanup-modules "n" } }
Index: vector_subscript_bound_1.f90
===================================================================
--- vector_subscript_bound_1.f90	(révision 177274)
+++ vector_subscript_bound_1.f90	(copie de travail)
@@ -17,3 +17,5 @@
     PRINT *, pw%cr(UBOUND(pw%cr))
   END SUBROUTINE pw_write
 END MODULE
+
+! { dg-final { cleanup-modules "pw_types" } }
Index: generic_typebound_operator_1.f90
===================================================================
--- generic_typebound_operator_1.f90	(révision 177274)
+++ generic_typebound_operator_1.f90	(copie de travail)
@@ -17,3 +17,5 @@
     end function gt_cmp
   end interface
 end module m_sort
+
+! { dg-final { cleanup-modules "m_sort" } }