alloc_comp_basics_1.f90: Fix dg directive.

2007-05-13  Dominique d'Humières  <dominiq@lps.ens.fr>

	* alloc_comp_basics_1.f90: Fix dg directive.
	* altreturn_3.f90: Likewise.
	* assumed_dummy_1.f90: Likewise.
	* default_numeric_type_1.f90: Likewise.
	* inquire_iolength.f90: Likewise.
	* module_naming_1.f90: Likewise.
	* oldstyle_2.f90: Likewise.
	* operator_2.f90: Likewise.
	* parameter_array_element_1.f90: Likewise.
	* used_types_11.f90: Likewise.
	* zero_array_components_1.f90: Likewise.
	* fmt_zero_precision.f90: Fix dg-output directives.
	* parameter_array_dummy.f90: Likewise.
	* real_const_3.f90: Likewise.

From-SVN: r124658

15 files changed, 86 insertions, 65 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7cb625a..fe908d1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,20 @@
+2007-05-13  Dominique d'Humières  <dominiq@lps.ens.fr>
+
+	* alloc_comp_basics_1.f90: Fix dg directive.
+	* altreturn_3.f90: Likewise.
+	* assumed_dummy_1.f90: Likewise.
+	* default_numeric_type_1.f90: Likewise.
+	* inquire_iolength.f90: Likewise.
+	* module_naming_1.f90: Likewise.
+	* oldstyle_2.f90: Likewise.
+	* operator_2.f90: Likewise.
+	* parameter_array_element_1.f90: Likewise.
+	* used_types_11.f90: Likewise.
+	* zero_array_components_1.f90: Likewise.
+	* fmt_zero_precision.f90: Fix dg-output directives.
+	* parameter_array_dummy.f90: Likewise.
+	* real_const_3.f90: Likewise.
+
 2007-05-13  Zdenek Dvorak  <dvorakz@suse.cz>
 
 	* gcc.dg/vect/no-section-anchors-vect-69.c: Fix outcome.
diff --git a/gcc/testsuite/gfortran.dg/alloc_comp_basics_1.f90 b/gcc/testsuite/gfortran.dg/alloc_comp_basics_1.f90
index a56282b..7099001 100644
--- a/gcc/testsuite/gfortran.dg/alloc_comp_basics_1.f90
+++ b/gcc/testsuite/gfortran.dg/alloc_comp_basics_1.f90
@@ -1,4 +1,4 @@
-! { dg-do run}
+! { dg-do run }
 ! { dg-options "-O2 -fdump-tree-original" }
 !
 ! Check some basic functionality of allocatable components, including that they
diff --git a/gcc/testsuite/gfortran.dg/altreturn_3.f90 b/gcc/testsuite/gfortran.dg/altreturn_3.f90
index d4b5afb..999ada8 100644
--- a/gcc/testsuite/gfortran.dg/altreturn_3.f90
+++ b/gcc/testsuite/gfortran.dg/altreturn_3.f90
@@ -1,4 +1,4 @@
-! { dg-do run}
+! { dg-do run }
 ! Tests the fix for PR30236, which was due to alternate returns
 ! in generic interfaces causing a segfault.  They now work
 ! correctly.
diff --git a/gcc/testsuite/gfortran.dg/assumed_dummy_1.f90 b/gcc/testsuite/gfortran.dg/assumed_dummy_1.f90
index f0cf775..f8d7fea 100644
--- a/gcc/testsuite/gfortran.dg/assumed_dummy_1.f90
+++ b/gcc/testsuite/gfortran.dg/assumed_dummy_1.f90
@@ -1,4 +1,4 @@
-! { dg-do run}
+! { dg-do run }
 ! Tests the fix for PRs 19358, 19477, 21211 and 21622.
 !
 ! Note that this tests only the valid cases with explicit interfaces.
diff --git a/gcc/testsuite/gfortran.dg/default_numeric_type_1.f90 b/gcc/testsuite/gfortran.dg/default_numeric_type_1.f90
index e8f8d35..62d633d 100644
--- a/gcc/testsuite/gfortran.dg/default_numeric_type_1.f90
+++ b/gcc/testsuite/gfortran.dg/default_numeric_type_1.f90
@@ -1,4 +1,4 @@
-! { dg-do compile}
+! { dg-do compile }
 ! { dg-options "-fdump-tree-original" }
 ! Tests the fix for PR 31222, in which the type of the arguments of abs
 ! and int below were not detected to be of default numeric type..
@@ -16,3 +16,4 @@ end subroutine
 program testprog
   call mysub1((/1.,2./),(/1.,2.,3./),-2, 3.2)
 end
+! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/fmt_zero_precision.f90 b/gcc/testsuite/gfortran.dg/fmt_zero_precision.f90
index 94f69a7..62e5238 100644
--- a/gcc/testsuite/gfortran.dg/fmt_zero_precision.f90
+++ b/gcc/testsuite/gfortran.dg/fmt_zero_precision.f90
@@ -2,8 +2,8 @@
 ! PR28354 Incorrect rounding of .99999 with f3.0 format specifier
 ! PR30910 ES format not quite right...
 ! Test case derived from PR. Submitted by Jerry DeLisle <jvdelisle@gcc.gnu.org>
-  write(*,50) -0.99999
   write(*,50) 0.99999
+  write(*,50) -0.99999
   write(*,50) -9.0
   write(*,50) -0.99
   write(*,50) -0.999
@@ -46,40 +46,40 @@
  250   format(1pe7.0,"<")
  300   format(1pe6.0,"<")
   end
-! { dg-output "-1.<"
-! { dg-output " 1.<"
-! { dg-output "-9.<"
-! { dg-output "-1.<"
-! { dg-output "-1.<"
-! { dg-output "-1.<"
-! { dg-output "-1.<"
-! { dg-output " 0.<"
-! { dg-output "     38.<"
-! { dg-output "  10345.<"
-! { dg-output "    334.<"
-! { dg-output "    333.<"
-! { dg-output "1.E-01"
-! { dg-output "-1.E+00<"
-! { dg-output " 1.E+00<"
-! { dg-output "-9.E+00<"
-! { dg-output "-1.E+00<"
-! { dg-output "-1.E+00<"
-! { dg-output "-1.E+00<"
-! { dg-output "-6.E-01<"
-! { dg-output "-5.E-01<"
-! { dg-output "  4.E+01<"
-! { dg-output "  1.E+04<"
-! { dg-output "  3.E+02<"
-! { dg-output "  3.E+02<"
-! { dg-output "-1.E+00<"
-! { dg-output " 1.E+00<"
-! { dg-output "-9.E+00<"
-! { dg-output "-1.E+00<"
-! { dg-output "-1.E+00<"
-! { dg-output "-1.E+00<"
-! { dg-output "-6.E-01<"
-! { dg-output "-5.E-01<"
-! { dg-output "4.E+01<"
-! { dg-output "1.E+04<"
-! { dg-output "3.E+02<"
-! { dg-output "3.E+02<"
+! { dg-output " 1\\.<(\n|\r\n|\r)" }
+! { dg-output "-1\\.<(\n|\r\n|\r)" }
+! { dg-output "-9\\.<(\n|\r\n|\r)" }
+! { dg-output "-1\\.<(\n|\r\n|\r)" }
+! { dg-output "-1\\.<(\n|\r\n|\r)" }
+! { dg-output "-1\\.<(\n|\r\n|\r)" }
+! { dg-output "-1\\.<(\n|\r\n|\r)" }
+! { dg-output " 0\\.<(\n|\r\n|\r)" }
+! { dg-output "     38\\.<(\n|\r\n|\r)" }
+! { dg-output "  10345\\.<(\n|\r\n|\r)" }
+! { dg-output "    334\\.<(\n|\r\n|\r)" }
+! { dg-output "    333\\.<(\n|\r\n|\r)" }
+! { dg-output "1\\.E-01(\n|\r\n|\r)" }
+! { dg-output "-1\\.E\\+00<(\n|\r\n|\r)" }
+! { dg-output " 1\\.E\\+00<(\n|\r\n|\r)" }
+! { dg-output "-9\\.E\\+00<(\n|\r\n|\r)" }
+! { dg-output "-1\\.E\\+00<(\n|\r\n|\r)" }
+! { dg-output "-1\\.E\\+00<(\n|\r\n|\r)" }
+! { dg-output "-1\\.E\\+00<(\n|\r\n|\r)" }
+! { dg-output "-6\\.E-01<(\n|\r\n|\r)" }
+! { dg-output "-5\\.E-01<(\n|\r\n|\r)" }
+! { dg-output "  4\\.E\\+01<(\n|\r\n|\r)" }
+! { dg-output "  1\\.E\\+04<(\n|\r\n|\r)" }
+! { dg-output "  3\\.E\\+02<(\n|\r\n|\r)" }
+! { dg-output "  3\\.E\\+02<(\n|\r\n|\r)" }
+! { dg-output "-1\\.E\\+00<(\n|\r\n|\r)" }
+! { dg-output " 1\\.E\\+00<(\n|\r\n|\r)" }
+! { dg-output "-9\\.E\\+00<(\n|\r\n|\r)" }
+! { dg-output "-1\\.E\\+00<(\n|\r\n|\r)" }
+! { dg-output "-1\\.E\\+00<(\n|\r\n|\r)" }
+! { dg-output "-1\\.E\\+00<(\n|\r\n|\r)" }
+! { dg-output "-6\\.E-01<(\n|\r\n|\r)" }
+! { dg-output "-5\\.E-01<(\n|\r\n|\r)" }
+! { dg-output "4\\.E\\+01<(\n|\r\n|\r)" }
+! { dg-output "1\\.E\\+04<(\n|\r\n|\r)" }
+! { dg-output "3\\.E\\+02<(\n|\r\n|\r)" }
+! { dg-output "3\\.E\\+02<(\n|\r\n|\r)" }
diff --git a/gcc/testsuite/gfortran.dg/inquire_iolength.f90 b/gcc/testsuite/gfortran.dg/inquire_iolength.f90
index 362746b..b6dfee2 100644
--- a/gcc/testsuite/gfortran.dg/inquire_iolength.f90
+++ b/gcc/testsuite/gfortran.dg/inquire_iolength.f90
@@ -1,4 +1,4 @@
-! { dg-do compile}
+! { dg-do compile }
 ! { dg-options "-std=f95" }
 ! PR30014 IOLENGTH does not handle KIND=8.  This patch checks the constraints.
 ! Submitted by Jerry DeLisle  <jvdelisle@gcc.gnu.org>
diff --git a/gcc/testsuite/gfortran.dg/module_naming_1.f90 b/gcc/testsuite/gfortran.dg/module_naming_1.f90
index 2a2d00b..7b9df0a 100644
--- a/gcc/testsuite/gfortran.dg/module_naming_1.f90
+++ b/gcc/testsuite/gfortran.dg/module_naming_1.f90
@@ -29,3 +29,4 @@ contains
     ! mangled to __m2_mod_m2_MOD_m3
   end subroutine m3
 end module m2_MOD_m2
+! { dg-final { cleanup-modules "m1 m1__m2 m2 m2_MOD_m2" } }
diff --git a/gcc/testsuite/gfortran.dg/oldstyle_2.f90 b/gcc/testsuite/gfortran.dg/oldstyle_2.f90
index 6f1b477..8d84028 100644
--- a/gcc/testsuite/gfortran.dg/oldstyle_2.f90
+++ b/gcc/testsuite/gfortran.dg/oldstyle_2.f90
@@ -1,4 +1,4 @@
-! { dg-do compile}
+! { dg-do compile }
 subroutine foo(i) ! { dg-error "DATA attribute" }
   integer i /10/
 end subroutine foo
diff --git a/gcc/testsuite/gfortran.dg/operator_2.f90 b/gcc/testsuite/gfortran.dg/operator_2.f90
index 11540ca..0e560da 100644
--- a/gcc/testsuite/gfortran.dg/operator_2.f90
+++ b/gcc/testsuite/gfortran.dg/operator_2.f90
@@ -38,3 +38,4 @@ contains
  end function f3
 
 end
+! { dg-final { cleanup-modules "foo" } }
diff --git a/gcc/testsuite/gfortran.dg/parameter_array_dummy.f90 b/gcc/testsuite/gfortran.dg/parameter_array_dummy.f90
index 2aa3ad8..d9a4343 100644
--- a/gcc/testsuite/gfortran.dg/parameter_array_dummy.f90
+++ b/gcc/testsuite/gfortran.dg/parameter_array_dummy.f90
@@ -1,4 +1,4 @@
-! { dg-do run}
+! { dg-do run }
 ! PR fortran/31188
 program foo_mod
   implicit none
@@ -14,8 +14,8 @@ contains
     write (*,*) i, "a" // letters(ivec)
   end subroutine concat
 end program foo_mod
-! { dg-output "1 aa" }
-! { dg-output "2 ab" }
-! { dg-output "3 aaab" }
-! { dg-output "4 abaa" }
-! { dg-output "5 ababab" }
+! { dg-output " *1 aa(\n|\r\n|\r)" }
+! { dg-output " *2 ab(\n|\r\n|\r)" }
+! { dg-output " *3 aaab(\n|\r\n|\r)" }
+! { dg-output " *4 abaa(\n|\r\n|\r)" }
+! { dg-output " *5 ababab(\n|\r\n|\r)" }
diff --git a/gcc/testsuite/gfortran.dg/parameter_array_element_1.f90 b/gcc/testsuite/gfortran.dg/parameter_array_element_1.f90
index 8dfe544..f5a33f8 100644
--- a/gcc/testsuite/gfortran.dg/parameter_array_element_1.f90
+++ b/gcc/testsuite/gfortran.dg/parameter_array_element_1.f90
@@ -1,4 +1,4 @@
-! { dg-do compile}
+! { dg-do compile }
 ! { dg-options "-fdump-tree-original" }
 ! Tests the fix for PR 30872, in which the array element references bo(1,1) etc.
 ! would be wrong for rank > 1.
diff --git a/gcc/testsuite/gfortran.dg/real_const_3.f90 b/gcc/testsuite/gfortran.dg/real_const_3.f90
index bab4e62..379ecb4 100644
--- a/gcc/testsuite/gfortran.dg/real_const_3.f90
+++ b/gcc/testsuite/gfortran.dg/real_const_3.f90
@@ -26,16 +26,16 @@ program main
   print *, z4
 
 end program main
-!{ dg-output "      +Infinity"
-!{ dg-output "   0.000000"
-!{ dg-output "      -Infinity"
-!{ dg-output "            NaN"
-!{ dg-output "            NaN"
-!{ dg-output "      -Infinity"
-!{ dg-output "      -Infinity"
-!{ dg-output "      +Infinity"
-!{ dg-output "            NaN"
-!{ dg-output " (           NaN,           NaN)"
-!{ dg-output " (           NaN,           NaN)"
-!{ dg-output " (     +Infinity,     -Infinity)"
-!{ dg-output " (  0.000000    ,  0.000000    )"
+!{ dg-output "      \\+Infinity(\n|\r\n|\r)" }
+!{ dg-output "   0.000000    (\n|\r\n|\r)" }
+!{ dg-output "      -Infinity(\n|\r\n|\r)" }
+!{ dg-output "            NaN(\n|\r\n|\r)" }
+!{ dg-output "            NaN(\n|\r\n|\r)" }
+!{ dg-output "      -Infinity(\n|\r\n|\r)" }
+!{ dg-output "      -Infinity(\n|\r\n|\r)" }
+!{ dg-output "      \\+Infinity(\n|\r\n|\r)" }
+!{ dg-output "            NaN(\n|\r\n|\r)" }
+!{ dg-output " \\(           NaN,           NaN\\)(\n|\r\n|\r)" }
+!{ dg-output " \\(           NaN,           NaN\\)(\n|\r\n|\r)" }
+!{ dg-output " \\(     \\+Infinity,     -Infinity\\)(\n|\r\n|\r)" }
+!{ dg-output " \\(  0.000000    ,  0.000000    \\)(\n|\r\n|\r)" }
diff --git a/gcc/testsuite/gfortran.dg/used_types_11.f90 b/gcc/testsuite/gfortran.dg/used_types_11.f90
index b3f4eaa..b820dc5 100644
--- a/gcc/testsuite/gfortran.dg/used_types_11.f90
+++ b/gcc/testsuite/gfortran.dg/used_types_11.f90
@@ -35,3 +35,4 @@ end subroutine bar
   x => foo ()
   print *, associated (x)
 end
+! { dg-final { cleanup-modules "A B" } }
diff --git a/gcc/testsuite/gfortran.dg/zero_array_components_1.f90 b/gcc/testsuite/gfortran.dg/zero_array_components_1.f90
index 514f90c..b1b8b5c 100644
--- a/gcc/testsuite/gfortran.dg/zero_array_components_1.f90
+++ b/gcc/testsuite/gfortran.dg/zero_array_components_1.f90
@@ -1,4 +1,4 @@
-! { dg do-run }
+! { dg-do run }
 ! Tests the fix for PR31620, in which zeroing the component a for the array,
 ! would zero all the components of the array.
 !