This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[fortran,committed] Clean-up leftover modules in testsuite
- From: Steve Kargl <sgk at troutmask dot apl dot washington dot edu>
- To: fortran at gcc dot gnu dot org, gcc-patches at gcc dot gnu dot org
- Date: Thu, 9 Jul 2009 17:37:52 -0700
- Subject: [fortran,committed] Clean-up leftover modules in testsuite
I've committed the attached, which is fairly obvious.
2009-07-09 Steven G. Kargl <kargl@gcc.gnu.org>
* gfortran.dg/c_kind_tests_2.f03: clean-up leftover module.
* gfortran.dg/module_equivalence_6.f90: Ditto.
* gfortran.dg/alloc_comp_auto_array_2.f90: Ditto.
* gfortran.dg/nan_2.f90: Ditto.
* gfortran.dg/inquire_11.f90: Ditto.
* gfortran.dg/abstract_type_3.f03: Ditto.
* gfortran.dg/abstract_type_1.f90: Ditto.
* gfortran.dg/private_type_9.f90: Ditto.
* gfortran.dg/abstract_type_5.f03: Ditto.
* gfortran.dg/elemental_subroutine_6.f90: Ditto.
* gfortran.dg/derived_comp_array_ref_3.f90: Ditto.
* gfortran.dg/derived_sub.f90: Ditto.
* gfortran.dg/missing_optional_dummy_5.f90: Ditto.
* gfortran.dg/bounds_check_fail_2.f90: Ditto.
* gfortran.dg/maxloc_bounds_6.f90: Ditto.
* gfortran.dg/mvbits_6.f90: Ditto.
* gfortran.dg/abstract_type_2.f03: Ditto.
* gfortran.dg/abstract_type_4.f03: Ditto.
* gfortran.dg/bounds_check_9.f90: Ditto.
* gfortran.dg/optional_dim_3.f90: Ditto.
* gfortran.dg/pr32921.f: Ditto.
* gfortran.dg/entry_16.f90: Ditto.
* gfortran.dg/generic_16.f90: Ditto.
--
Steve
Index: gcc/testsuite/gfortran.dg/c_kind_tests_2.f03
===================================================================
--- gcc/testsuite/gfortran.dg/c_kind_tests_2.f03 (revision 149449)
+++ gcc/testsuite/gfortran.dg/c_kind_tests_2.f03 (working copy)
@@ -12,3 +12,4 @@ module c_kind_tests_2
real(myI), bind(c) :: myCFloat2 ! { dg-warning "is for type INTEGER" }
real(4), bind(c) :: myFloat ! { dg-warning "may not be a C interoperable" }
end module c_kind_tests_2
+! { dg-final { cleanup-modules "c_kind_tests_2" } }
Index: gcc/testsuite/gfortran.dg/module_equivalence_6.f90
===================================================================
--- gcc/testsuite/gfortran.dg/module_equivalence_6.f90 (revision 149449)
+++ gcc/testsuite/gfortran.dg/module_equivalence_6.f90 (working copy)
@@ -19,4 +19,4 @@ PROGRAM fortranlibtest
INTEGER :: ii
ii = H5P_DEFAULT_F
END PROGRAM fortranlibtest
-! { dg-final { cleanup-modules "H5GLOBAL HD5" } }
+! { dg-final { cleanup-modules "H5GLOBAL HDF5" } }
Index: gcc/testsuite/gfortran.dg/alloc_comp_auto_array_2.f90
===================================================================
--- gcc/testsuite/gfortran.dg/alloc_comp_auto_array_2.f90 (revision 149449)
+++ gcc/testsuite/gfortran.dg/alloc_comp_auto_array_2.f90 (working copy)
@@ -38,3 +38,4 @@ end module grid_io
call read_grid_header
end
! { dg-final { cleanup-tree-dump "grid_io" } }
+! { dg-final { cleanup-modules "grid_io" } }
Index: gcc/testsuite/gfortran.dg/nan_2.f90
===================================================================
--- gcc/testsuite/gfortran.dg/nan_2.f90 (revision 149449)
+++ gcc/testsuite/gfortran.dg/nan_2.f90 (working copy)
@@ -105,3 +105,4 @@ program test
if (isinf(max(-large, -inf, nan))) call abort
end program test
+! { dg-final { cleanup-modules "aux2" } }
Index: gcc/testsuite/gfortran.dg/inquire_11.f90
===================================================================
--- gcc/testsuite/gfortran.dg/inquire_11.f90 (revision 149449)
+++ gcc/testsuite/gfortran.dg/inquire_11.f90 (working copy)
@@ -8,3 +8,4 @@ CONTAINS
INQUIRE (UNIT=1, EXIST=qexist)
END SUBROUTINE i
END MODULE print_it
+! { dg-final { cleanup-modules "print_it" } }
Index: gcc/testsuite/gfortran.dg/abstract_type_3.f03
===================================================================
--- gcc/testsuite/gfortran.dg/abstract_type_3.f03 (revision 149449)
+++ gcc/testsuite/gfortran.dg/abstract_type_3.f03 (working copy)
@@ -49,3 +49,4 @@ CONTAINS
END SUBROUTINE impl
END MODULE m
+! { dg-final { cleanup-modules "m" } }
Index: gcc/testsuite/gfortran.dg/abstract_type_1.f90
===================================================================
--- gcc/testsuite/gfortran.dg/abstract_type_1.f90 (revision 149449)
+++ gcc/testsuite/gfortran.dg/abstract_type_1.f90 (working copy)
@@ -11,3 +11,4 @@ MODULE m
END TYPE t ! { dg-error "END MODULE" }
END MODULE m
+! { dg-final { cleanup-modules "m" } }
Index: gcc/testsuite/gfortran.dg/private_type_9.f90
===================================================================
--- gcc/testsuite/gfortran.dg/private_type_9.f90 (revision 149449)
+++ gcc/testsuite/gfortran.dg/private_type_9.f90 (working copy)
@@ -39,3 +39,4 @@ module m4
end module m4
end
+! { dg-final { cleanup-modules "m1 m2 m3 m4" } }
Index: gcc/testsuite/gfortran.dg/abstract_type_5.f03
===================================================================
--- gcc/testsuite/gfortran.dg/abstract_type_5.f03 (revision 149449)
+++ gcc/testsuite/gfortran.dg/abstract_type_5.f03 (working copy)
@@ -43,3 +43,4 @@ CONTAINS
END SUBROUTINE test
END MODULE m
+! { dg-final { cleanup-modules "m" } }
Index: gcc/testsuite/gfortran.dg/elemental_subroutine_6.f90
===================================================================
--- gcc/testsuite/gfortran.dg/elemental_subroutine_6.f90 (revision 149449)
+++ gcc/testsuite/gfortran.dg/elemental_subroutine_6.f90 (working copy)
@@ -21,4 +21,5 @@ CONTAINS
ALLOCATE( out(1:42, 1:42) )
out(1, 1:42) = in(1, 1:42)
END SUBROUTINE
-END MODULE foo
\ No newline at end of file
+END MODULE foo
+! { dg-final { cleanup-modules "foo" } }
Index: gcc/testsuite/gfortran.dg/derived_comp_array_ref_3.f90
===================================================================
--- gcc/testsuite/gfortran.dg/derived_comp_array_ref_3.f90 (revision 149449)
+++ gcc/testsuite/gfortran.dg/derived_comp_array_ref_3.f90 (working copy)
@@ -26,4 +26,4 @@ END MODULE cdf_nc_chisq_mod
use cdf_nc_chisq_mod
call local_cum_nc_chisq
end
-! { dg-final { cleanup-modules "cdf_aux_mod cdf_beta_mod" } }
+! { dg-final { cleanup-modules "cdf_nc_chisq_mod" } }
Index: gcc/testsuite/gfortran.dg/derived_sub.f90
===================================================================
--- gcc/testsuite/gfortran.dg/derived_sub.f90 (revision 149449)
+++ gcc/testsuite/gfortran.dg/derived_sub.f90 (working copy)
@@ -31,3 +31,4 @@ contains
end subroutine
end module
+! { dg-final { cleanup-modules "modone modtwo" } }
Index: gcc/testsuite/gfortran.dg/missing_optional_dummy_5.f90
===================================================================
--- gcc/testsuite/gfortran.dg/missing_optional_dummy_5.f90 (revision 149449)
+++ gcc/testsuite/gfortran.dg/missing_optional_dummy_5.f90 (working copy)
@@ -25,5 +25,5 @@ end module krmod
! { dg-final { scan-tree-dump " tm_doit \\(&parm.\(6|7\), 0B, 0\\);" "original" } }
! { dg-final { cleanup-tree-dump "original" } }
-! { dg-final { cleanup-modules "pr22146" } }
+! { dg-final { cleanup-modules "krmod" } }
Index: gcc/testsuite/gfortran.dg/bounds_check_fail_2.f90
===================================================================
--- gcc/testsuite/gfortran.dg/bounds_check_fail_2.f90 (revision 149449)
+++ gcc/testsuite/gfortran.dg/bounds_check_fail_2.f90 (working copy)
@@ -37,3 +37,4 @@ program main
call sub((/4/))
end program main
! { dg-output "Fortran runtime error: Array bound mismatch" }
+! { dg-final { cleanup-modules "sub_mod" } }
Index: gcc/testsuite/gfortran.dg/maxloc_bounds_6.f90
===================================================================
--- gcc/testsuite/gfortran.dg/maxloc_bounds_6.f90 (revision 149449)
+++ gcc/testsuite/gfortran.dg/maxloc_bounds_6.f90 (working copy)
@@ -13,4 +13,3 @@ program main
write(line,fmt='(80I1)') res
end program main
! { dg-output "Fortran runtime error: Incorrect extent in MASK argument of MAXLOC intrinsic in dimension 2: is 3, should be 2" }
-! { dg-final { cleanup-modules "tst" } }
Index: gcc/testsuite/gfortran.dg/mvbits_6.f90
===================================================================
--- gcc/testsuite/gfortran.dg/mvbits_6.f90 (revision 149449)
+++ gcc/testsuite/gfortran.dg/mvbits_6.f90 (working copy)
@@ -31,3 +31,4 @@
call yg0009(tda2l,4,3,1,-1,-4,-3)
end
+! { dg-final { cleanup-modules "yg0009_stuff" } }
Index: gcc/testsuite/gfortran.dg/abstract_type_2.f03
===================================================================
--- gcc/testsuite/gfortran.dg/abstract_type_2.f03 (revision 149449)
+++ gcc/testsuite/gfortran.dg/abstract_type_2.f03 (working copy)
@@ -11,3 +11,4 @@ MODULE m
END TYPE error_t ! { dg-error "END MODULE" }
END MODULE m
+! { dg-final { cleanup-modules "m" } }
Index: gcc/testsuite/gfortran.dg/abstract_type_4.f03
===================================================================
--- gcc/testsuite/gfortran.dg/abstract_type_4.f03 (revision 149449)
+++ gcc/testsuite/gfortran.dg/abstract_type_4.f03 (working copy)
@@ -26,3 +26,4 @@ PROGRAM main
! See if constructing the extending type works.
conc = concrete_t (1, 2)
END PROGRAM main
+! { dg-final { cleanup-modules "m" } }
Index: gcc/testsuite/gfortran.dg/bounds_check_9.f90
===================================================================
--- gcc/testsuite/gfortran.dg/bounds_check_9.f90 (revision 149449)
+++ gcc/testsuite/gfortran.dg/bounds_check_9.f90 (working copy)
@@ -34,3 +34,4 @@ program main
call sub()
call sub((/4,5/))
end program main
+! { dg-final { cleanup-modules "sub_mod" } }
Index: gcc/testsuite/gfortran.dg/optional_dim_3.f90
===================================================================
--- gcc/testsuite/gfortran.dg/optional_dim_3.f90 (revision 149449)
+++ gcc/testsuite/gfortran.dg/optional_dim_3.f90 (working copy)
@@ -50,3 +50,4 @@ program main
call sub(bound=.false., dimmy=1_8)
call sub()
end program main
+! { dg-final { cleanup-modules "tst_foo" } }
Index: gcc/testsuite/gfortran.dg/pr32921.f
===================================================================
--- gcc/testsuite/gfortran.dg/pr32921.f (revision 149449)
+++ gcc/testsuite/gfortran.dg/pr32921.f (working copy)
@@ -47,3 +47,4 @@
END
! { dg-final { scan-tree-dump-times "stride" 4 "lim" } }
! { dg-final { cleanup-tree-dump "lim" } }
+! { dg-final { cleanup-modules "LES3D_DATA" } }
Index: gcc/testsuite/gfortran.dg/entry_16.f90
===================================================================
--- gcc/testsuite/gfortran.dg/entry_16.f90 (revision 149449)
+++ gcc/testsuite/gfortran.dg/entry_16.f90 (working copy)
@@ -41,3 +41,4 @@ END MODULE complex
if (.not.((a + b) .eq. (b + a))) call abort ()
if (.not.((a + b) .eq. cx (4, 2))) call abort ()
end
+! { dg-final { cleanup-modules "complex" } }
Index: gcc/testsuite/gfortran.dg/generic_16.f90
===================================================================
--- gcc/testsuite/gfortran.dg/generic_16.f90 (revision 149449)
+++ gcc/testsuite/gfortran.dg/generic_16.f90 (working copy)
@@ -32,3 +32,4 @@ PROGRAM main
REAL(kind=dp) :: rawData(2), data, work(3)
data = median(rawData, work) ! { dg-error "no specific function" }
END PROGRAM main
+! { dg-final { cleanup-modules "auxiliary" } }