This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch gfortran testsuite] Fix some dg-output in the testsuite


This patch fixes some dg-output.

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

	* fmt_zero_precision.f90: Fix dg-output directives.
	* parameter_array_dummy.f90: Likewise.
	* real_const_3.f90: Likewise.
	
diff -upr gcc-4.3-20070512/gcc/testsuite/gfortran.dg/fmt_zero_precision.f90 gcc-4.3-20070511/gcc/testsuite/gfortran.dg/fmt_zero_precision.f90
--- gcc-4.3-20070512/gcc/testsuite/gfortran.dg/fmt_zero_precision.f90   Thu Mar 29 22:44:47 2007
+++ gcc-4.3-20070511/gcc/testsuite/gfortran.dg/fmt_zero_precision.f90   Sun May 13 17:37:47 2007
@@ -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 -upr gcc-4.3-20070512/gcc/testsuite/gfortran.dg/parameter_array_dummy.f90 gcc-4.3-20070511/gcc/testsuite/gfortran.dg/parameter_array_dummy.f90
--- gcc-4.3-20070512/gcc/testsuite/gfortran.dg/parameter_array_dummy.f90        Fri Mar 16 11:57:45 2007
+++ gcc-4.3-20070511/gcc/testsuite/gfortran.dg/parameter_array_dummy.f90        Sun May 13 17:44:07 2007
@@ -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 -upr gcc-4.3-20070512/gcc/testsuite/gfortran.dg/real_const_3.f90 gcc-4.3-20070511/gcc/testsuite/gfortran.dg/real_const_3.f90
--- gcc-4.3-20070512/gcc/testsuite/gfortran.dg/real_const_3.f90 Thu Mar 29 22:44:47 2007
+++ gcc-4.3-20070511/gcc/testsuite/gfortran.dg/real_const_3.f90 Sun May 13 17:41:56 2007
@@ -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)" }


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]