func_derived_4.f90: Fix module cleanup.

* gfortran.dg/func_derived_4.f90: Fix module cleanup.
* gfortran.dg/gomp/appendix-a/a.22.4.f90: Clean up modules.
* gfortran.dg/gomp/appendix-a/a.26.2.f90: Likewise.
* gfortran.dg/gomp/appendix-a/a.32.1.f90: Likewise.
* gfortran.dg/overload_1.f90: Likewise.
* gfortran.dg/impure_assignment_1.f90: Likewise.
* gfortran.dg/error_recovery_3.f90: Likewise.
* gfortran.dg/alloc_comp_basics_1.f90: Likewise.
* gfortran.dg/sequence_types_1.f90: Likewise.
* gfortran.dg/internal_references_1.f90: Likewise.
* gfortran.dg/present_1.f90: Likewise.
* gfortran.dg/volatile10.f90: Likewise.
* gfortran.dg/module_equivalence_2.f90: Likewise.
* gfortran.dg/use_4.f90: Likewise.
* gfortran.dg/elemental_result_1.f90: Likewise.
* gfortran.dg/generic_actual_arg.f90: Likewise.
* gfortran.dg/private_type_5.f90: Likewise.
* gfortran.dg/protected_4.f90: Likewise.
* gfortran.dg/interface_3.f90: Likewise.

From-SVN: r123225

20 files changed, 47 insertions, 11 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ca0767c..d9fa344 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,25 @@
+2007-03-26  Brooks Moses  <brooks.moses@codesourcery.com>
+
+	* gfortran.dg/func_derived_4.f90: Fix module cleanup.
+	* gfortran.dg/gomp/appendix-a/a.22.4.f90: Clean up modules.
+	* gfortran.dg/gomp/appendix-a/a.26.2.f90: Likewise.
+	* gfortran.dg/gomp/appendix-a/a.32.1.f90: Likewise.
+	* gfortran.dg/overload_1.f90: Likewise.
+	* gfortran.dg/impure_assignment_1.f90: Likewise.
+	* gfortran.dg/error_recovery_3.f90: Likewise.
+	* gfortran.dg/alloc_comp_basics_1.f90: Likewise.
+	* gfortran.dg/sequence_types_1.f90: Likewise.
+	* gfortran.dg/internal_references_1.f90: Likewise.
+	* gfortran.dg/present_1.f90: Likewise.
+	* gfortran.dg/volatile10.f90: Likewise.
+	* gfortran.dg/module_equivalence_2.f90: Likewise.
+	* gfortran.dg/use_4.f90: Likewise.
+	* gfortran.dg/elemental_result_1.f90: Likewise.
+	* gfortran.dg/generic_actual_arg.f90: Likewise.
+	* gfortran.dg/private_type_5.f90: Likewise.
+	* gfortran.dg/protected_4.f90: Likewise.
+	* gfortran.dg/interface_3.f90: Likewise.
+
 2007-03-26  Uros Bizjak  <ubizjak@gmail.com>
 
 	* lib/gcc-dg.exp (gcc-dg-debug-runtest): Remove build file trivial.S.
diff --git a/gcc/testsuite/gfortran.dg/alloc_comp_basics_1.f90 b/gcc/testsuite/gfortran.dg/alloc_comp_basics_1.f90
index 649c4a7..a56282b 100644
--- a/gcc/testsuite/gfortran.dg/alloc_comp_basics_1.f90
+++ b/gcc/testsuite/gfortran.dg/alloc_comp_basics_1.f90
@@ -141,3 +141,4 @@ contains
 end program alloc
 ! { dg-final { scan-tree-dump-times "deallocate" 33 "original" } }
 ! { dg-final { cleanup-tree-dump "original" } }
+! { dg-final { cleanup-modules "alloc_m" } }
diff --git a/gcc/testsuite/gfortran.dg/elemental_result_1.f90 b/gcc/testsuite/gfortran.dg/elemental_result_1.f90
index c94e08e..2a6dee0 100644
--- a/gcc/testsuite/gfortran.dg/elemental_result_1.f90
+++ b/gcc/testsuite/gfortran.dg/elemental_result_1.f90
@@ -18,4 +18,4 @@ CONTAINS
     INTEGER, pointer  :: MM ! { dg-error "conflicts with ELEMENTAL" }
   END FUNCTION MM
 END MODULE Test
-
+! { dg-final { cleanup-modules "Test" } }
diff --git a/gcc/testsuite/gfortran.dg/error_recovery_3.f90 b/gcc/testsuite/gfortran.dg/error_recovery_3.f90
index d0ec205..b1da9cb 100644
--- a/gcc/testsuite/gfortran.dg/error_recovery_3.f90
+++ b/gcc/testsuite/gfortran.dg/error_recovery_3.f90
@@ -6,4 +6,6 @@ MODULE M1
  INTEGER :: I
 END MODULE M1
 
-USE M1,                    ONLY: I,&! { dg-error "Missing" }
\ No newline at end of file
+USE M1,                    ONLY: I,&! { dg-error "Missing" }
+! { dg-final { cleanup-modules "M1" } }
+
diff --git a/gcc/testsuite/gfortran.dg/func_derived_4.f90 b/gcc/testsuite/gfortran.dg/func_derived_4.f90
index 86be8d4..532d821 100644
--- a/gcc/testsuite/gfortran.dg/func_derived_4.f90
+++ b/gcc/testsuite/gfortran.dg/func_derived_4.f90
@@ -102,4 +102,4 @@ program test_pnt
   mshp => msh_(quality)
 end program test_pnt
 
-! { dg-final { cleanup-modules "class_mesh class_scalar_field class_mesh" } }
+! { dg-final { cleanup-modules "class_mesh class_field class_scalar_field" } }
diff --git a/gcc/testsuite/gfortran.dg/generic_actual_arg.f90 b/gcc/testsuite/gfortran.dg/generic_actual_arg.f90
index 93a6588..9087a5d 100644
--- a/gcc/testsuite/gfortran.dg/generic_actual_arg.f90
+++ b/gcc/testsuite/gfortran.dg/generic_actual_arg.f90
@@ -22,4 +22,5 @@ CALL F(CALCULATION) ! { dg-error "GENERIC non-INTRINSIC procedure" }
 END
 
 SUBROUTINE F()
-END SUBROUTINE
\ No newline at end of file
+END SUBROUTINE
+! { dg-final { cleanup-modules "TEST" } }
diff --git a/gcc/testsuite/gfortran.dg/gomp/appendix-a/a.22.4.f90 b/gcc/testsuite/gfortran.dg/gomp/appendix-a/a.22.4.f90
index f769fc1..2a63758 100644
--- a/gcc/testsuite/gfortran.dg/gomp/appendix-a/a.22.4.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/appendix-a/a.22.4.f90
@@ -9,3 +9,4 @@
 !$OMP THREADPRIVATE(/T/)	! { dg-error "COMMON block" }
       !non-conforming because /T/ not declared in A22_4_WRONG
       END SUBROUTINE A22_4_WRONG
+! { dg-final { cleanup-modules "A22_MODULE" } }
diff --git a/gcc/testsuite/gfortran.dg/gomp/appendix-a/a.26.2.f90 b/gcc/testsuite/gfortran.dg/gomp/appendix-a/a.26.2.f90
index 97c14d9..3d43424 100644
--- a/gcc/testsuite/gfortran.dg/gomp/appendix-a/a.26.2.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/appendix-a/a.26.2.f90
@@ -20,3 +20,4 @@
 !$OMP END PARALLEL DO
           END SUBROUTINE F
       END MODULE A26_2
+! { dg-final { cleanup-modules "A26_2" } }
diff --git a/gcc/testsuite/gfortran.dg/gomp/appendix-a/a.32.1.f90 b/gcc/testsuite/gfortran.dg/gomp/appendix-a/a.32.1.f90
index 8e0b5e0..498a6d3 100644
--- a/gcc/testsuite/gfortran.dg/gomp/appendix-a/a.32.1.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/appendix-a/a.32.1.f90
@@ -22,3 +22,4 @@
         ALLOCATE(WORK(SIZE))
         WORK = TOL
       END SUBROUTINE BUILD
+! { dg-final { cleanup-modules "M" } }
diff --git a/gcc/testsuite/gfortran.dg/impure_assignment_1.f90 b/gcc/testsuite/gfortran.dg/impure_assignment_1.f90
index 772ba75..f7362af 100644
--- a/gcc/testsuite/gfortran.dg/impure_assignment_1.f90
+++ b/gcc/testsuite/gfortran.dg/impure_assignment_1.f90
@@ -23,4 +23,6 @@ PURE SUBROUTINE S2(I,J)
      TYPE(T1), INTENT(IN) :: J
      I=J                      ! { dg-error "must be PURE" }
 END SUBROUTINE S2
-END
\ No newline at end of file
+END
+! { dg-final { cleanup-modules "M1" } }
+
diff --git a/gcc/testsuite/gfortran.dg/interface_3.f90 b/gcc/testsuite/gfortran.dg/interface_3.f90
index ecc7c4f..0a23fb0 100644
--- a/gcc/testsuite/gfortran.dg/interface_3.f90
+++ b/gcc/testsuite/gfortran.dg/interface_3.f90
@@ -66,4 +66,4 @@ subroutine his_fun (a)
   print *, my_fun (a)  ! { dg-error "ambiguous reference" }
 end subroutine his_fun
 
-! { dg-final { cleanup-modules "test_mod" } }
+! { dg-final { cleanup-modules "test_mod test_mod2" } }
diff --git a/gcc/testsuite/gfortran.dg/internal_references_1.f90 b/gcc/testsuite/gfortran.dg/internal_references_1.f90
index 461fbfa..73b9da6 100644
--- a/gcc/testsuite/gfortran.dg/internal_references_1.f90
+++ b/gcc/testsuite/gfortran.dg/internal_references_1.f90
@@ -33,4 +33,4 @@ contains
       bar = 1.0
     end function bar
 end program test
-
+! { dg-final { cleanup-modules "m" } }
diff --git a/gcc/testsuite/gfortran.dg/module_equivalence_2.f90 b/gcc/testsuite/gfortran.dg/module_equivalence_2.f90
index 3ec8efb..f6a3c34 100644
--- a/gcc/testsuite/gfortran.dg/module_equivalence_2.f90
+++ b/gcc/testsuite/gfortran.dg/module_equivalence_2.f90
@@ -22,3 +22,4 @@ end module b
   reM = 0.57d1
   if (M .ne. 0.57d1) call abort ()
 end
+! { dg-final { cleanup-modules "a b" } }
diff --git a/gcc/testsuite/gfortran.dg/overload_1.f90 b/gcc/testsuite/gfortran.dg/overload_1.f90
index 97aa843..fc38a6c 100644
--- a/gcc/testsuite/gfortran.dg/overload_1.f90
+++ b/gcc/testsuite/gfortran.dg/overload_1.f90
@@ -181,3 +181,4 @@ contains
          & abort
   end subroutine checku
 end program main
+! { dg-final { cleanup-modules "m" } }
diff --git a/gcc/testsuite/gfortran.dg/present_1.f90 b/gcc/testsuite/gfortran.dg/present_1.f90
index 9612039..6dee264 100644
--- a/gcc/testsuite/gfortran.dg/present_1.f90
+++ b/gcc/testsuite/gfortran.dg/present_1.f90
@@ -17,4 +17,4 @@
   END SUBROUTINE S1
  END MODULE
  END
-
+! { dg-final { cleanup-modules "M1" } }
diff --git a/gcc/testsuite/gfortran.dg/private_type_5.f90 b/gcc/testsuite/gfortran.dg/private_type_5.f90
index e62fe6e..0fcf00e 100644
--- a/gcc/testsuite/gfortran.dg/private_type_5.f90
+++ b/gcc/testsuite/gfortran.dg/private_type_5.f90
@@ -21,4 +21,5 @@ contains
       ir%i = i
     end subroutine init
   end subroutine sub
-end module test
\ No newline at end of file
+end module test
+! { dg-final { cleanup-modules "test" } }
diff --git a/gcc/testsuite/gfortran.dg/protected_4.f90 b/gcc/testsuite/gfortran.dg/protected_4.f90
index 7d2238e..1816142 100644
--- a/gcc/testsuite/gfortran.dg/protected_4.f90
+++ b/gcc/testsuite/gfortran.dg/protected_4.f90
@@ -55,4 +55,4 @@ module test
   protected :: test ! { dg-error "MODULE attribute conflicts with PROTECTED" }
 end module test
 
-! { dg-final { cleanup-modules "protmod" } }
+! { dg-final { cleanup-modules "protmod test" } }
diff --git a/gcc/testsuite/gfortran.dg/sequence_types_1.f90 b/gcc/testsuite/gfortran.dg/sequence_types_1.f90
index 6c0bb24..62cd8fd 100644
--- a/gcc/testsuite/gfortran.dg/sequence_types_1.f90
+++ b/gcc/testsuite/gfortran.dg/sequence_types_1.f90
@@ -77,3 +77,4 @@ module data_types
     Integer(kindInt), dimension(:), pointer :: subset
   end type GroupDefLL
 end module data_types
+! { dg-final { cleanup-modules "data_types" } }
diff --git a/gcc/testsuite/gfortran.dg/use_4.f90 b/gcc/testsuite/gfortran.dg/use_4.f90
index 43d94bc..a765ace 100644
--- a/gcc/testsuite/gfortran.dg/use_4.f90
+++ b/gcc/testsuite/gfortran.dg/use_4.f90
@@ -31,3 +31,4 @@ program test_foo
   use foo, only: i => foo! { dg-error "been used as an external module name" }
   use foo, only: foo => i! { dg-error "been used as an external module name" }
 end program
+! { dg-final { cleanup-modules "foo bar test test2 test3" } }
diff --git a/gcc/testsuite/gfortran.dg/volatile10.f90 b/gcc/testsuite/gfortran.dg/volatile10.f90
index 493abf7..2065b16 100644
--- a/gcc/testsuite/gfortran.dg/volatile10.f90
+++ b/gcc/testsuite/gfortran.dg/volatile10.f90
@@ -146,4 +146,4 @@ end program main
 ! TODO: dg-final { scan-tree-dump-not  "main_test2_3" "optimized" } 
 ! { dg-final { scan-tree-dump      "main_test2_4" "optimized" } }
 ! { dg-final { cleanup-tree-dump  "optimized" } }
-! { dg-final { cleanup-modules "one two" } }
+! { dg-final { cleanup-modules "impl one two" } }