Hi Dominique, if I'm not mistaken, the cleanup of module file in the testsuite is done automatically by now, right? Couldn't one do the same also for submodules?
Cheers, Janus 2017-04-15 10:34 GMT+02:00 Dominique d'Humières <domi...@lps.ens.fr>: > Hi! > > Unless someone objects, I am planning to commit the following cleanup > > --- ../_clean/gcc/testsuite/gfortran.dg/submodule_17.f08 2016-08-24 > 21:57:16.000000000 +0200 > +++ gcc/testsuite/gfortran.dg/submodule_17.f08 2017-04-15 10:19:32.000000000 > +0200 > @@ -25,3 +25,4 @@ end submodule > use hello_interface > if (get() .ne. string) call abort > end > +! { dg-final { cleanup-submodules "hello_interface@hello_implementation" } } > --- ../_clean/gcc/testsuite/gfortran.dg/submodule_22.f08 2016-11-27 > 20:08:35.000000000 +0100 > +++ gcc/testsuite/gfortran.dg/submodule_22.f08 2017-04-15 10:21:50.000000000 > +0200 > @@ -45,3 +45,5 @@ contains > s = 2.0 > end subroutine sub3 > end > +! { dg-final { cleanup-submodules "mtop@submod" } } > +! { dg-final { cleanup-submodules "mtop@subsubmod" } } > --- ../_clean/gcc/testsuite/gfortran.dg/submodule_23.f90 2017-02-19 > 19:28:37.000000000 +0100 > +++ gcc/testsuite/gfortran.dg/submodule_23.f90 2017-04-15 10:26:53.000000000 > +0200 > @@ -27,3 +27,4 @@ end submodule > use mod > print *, fun1(10) > end > +! { dg-final { cleanup-submodules "mod@submod" } } > --- ../_clean/gcc/testsuite/gfortran.dg/submodule_24.f08 2017-02-19 > 22:13:44.000000000 +0100 > +++ gcc/testsuite/gfortran.dg/submodule_24.f08 2017-04-15 10:11:15.000000000 > +0200 > @@ -21,3 +21,4 @@ contains > end procedure > !end subroutine ! gfortran accepted this invalid workaround > end submodule > +! { dg-final { cleanup-submodules "foo_interface@foo_implementation" } } > --- ../_clean/gcc/testsuite/gfortran.dg/submodule_26.f08 2017-03-18 > 13:14:10.000000000 +0100 > +++ gcc/testsuite/gfortran.dg/submodule_26.f08 2017-04-15 10:13:03.000000000 > +0200 > @@ -44,3 +44,4 @@ contains > module procedure cgca_clvgp > end procedure cgca_clvgp > end submodule m3clvg_sm3 > +! { dg-final { cleanup-submodules "cgca_m3clvg@m3clvg_sm3" } } > --- ../_clean/gcc/testsuite/gfortran.dg/submodule_27.f08 2017-03-18 > 13:14:10.000000000 +0100 > +++ gcc/testsuite/gfortran.dg/submodule_27.f08 2017-04-15 10:13:35.000000000 > +0200 > @@ -42,3 +42,4 @@ end submodule m3clvg_sm3 > call cgca_clvgp (hello) > if (trim (greeting) .ne. "hello") call abort > end > +! { dg-final { cleanup-submodules "cgca_m3clvg@m3clvg_sm3" } } > --- ../_clean/gcc/testsuite/gfortran.dg/submodule_28.f08 2017-03-18 > 13:48:04.000000000 +0100 > +++ gcc/testsuite/gfortran.dg/submodule_28.f08 2017-04-15 10:14:32.000000000 > +0200 > @@ -50,3 +50,4 @@ program hello > call routine1(2) > if (answer .ne. 4) call abort > end program > +! { dg-final { cleanup-submodules "my_mod@my_submod" } } > > Dominique > 2017-04-15 10:34 GMT+02:00 Dominique d'Humières <domi...@lps.ens.fr>: > Hi! > > Unless someone objects, I am planning to commit the following cleanup > > --- ../_clean/gcc/testsuite/gfortran.dg/submodule_17.f08 2016-08-24 > 21:57:16.000000000 +0200 > +++ gcc/testsuite/gfortran.dg/submodule_17.f08 2017-04-15 10:19:32.000000000 > +0200 > @@ -25,3 +25,4 @@ end submodule > use hello_interface > if (get() .ne. string) call abort > end > +! { dg-final { cleanup-submodules "hello_interface@hello_implementation" } } > --- ../_clean/gcc/testsuite/gfortran.dg/submodule_22.f08 2016-11-27 > 20:08:35.000000000 +0100 > +++ gcc/testsuite/gfortran.dg/submodule_22.f08 2017-04-15 10:21:50.000000000 > +0200 > @@ -45,3 +45,5 @@ contains > s = 2.0 > end subroutine sub3 > end > +! { dg-final { cleanup-submodules "mtop@submod" } } > +! { dg-final { cleanup-submodules "mtop@subsubmod" } } > --- ../_clean/gcc/testsuite/gfortran.dg/submodule_23.f90 2017-02-19 > 19:28:37.000000000 +0100 > +++ gcc/testsuite/gfortran.dg/submodule_23.f90 2017-04-15 10:26:53.000000000 > +0200 > @@ -27,3 +27,4 @@ end submodule > use mod > print *, fun1(10) > end > +! { dg-final { cleanup-submodules "mod@submod" } } > --- ../_clean/gcc/testsuite/gfortran.dg/submodule_24.f08 2017-02-19 > 22:13:44.000000000 +0100 > +++ gcc/testsuite/gfortran.dg/submodule_24.f08 2017-04-15 10:11:15.000000000 > +0200 > @@ -21,3 +21,4 @@ contains > end procedure > !end subroutine ! gfortran accepted this invalid workaround > end submodule > +! { dg-final { cleanup-submodules "foo_interface@foo_implementation" } } > --- ../_clean/gcc/testsuite/gfortran.dg/submodule_26.f08 2017-03-18 > 13:14:10.000000000 +0100 > +++ gcc/testsuite/gfortran.dg/submodule_26.f08 2017-04-15 10:13:03.000000000 > +0200 > @@ -44,3 +44,4 @@ contains > module procedure cgca_clvgp > end procedure cgca_clvgp > end submodule m3clvg_sm3 > +! { dg-final { cleanup-submodules "cgca_m3clvg@m3clvg_sm3" } } > --- ../_clean/gcc/testsuite/gfortran.dg/submodule_27.f08 2017-03-18 > 13:14:10.000000000 +0100 > +++ gcc/testsuite/gfortran.dg/submodule_27.f08 2017-04-15 10:13:35.000000000 > +0200 > @@ -42,3 +42,4 @@ end submodule m3clvg_sm3 > call cgca_clvgp (hello) > if (trim (greeting) .ne. "hello") call abort > end > +! { dg-final { cleanup-submodules "cgca_m3clvg@m3clvg_sm3" } } > --- ../_clean/gcc/testsuite/gfortran.dg/submodule_28.f08 2017-03-18 > 13:48:04.000000000 +0100 > +++ gcc/testsuite/gfortran.dg/submodule_28.f08 2017-04-15 10:14:32.000000000 > +0200 > @@ -50,3 +50,4 @@ program hello > call routine1(2) > if (answer .ne. 4) call abort > end program > +! { dg-final { cleanup-submodules "my_mod@my_submod" } } > > Dominique >