re PR libfortran/47434 (Wrong field width for NaN with (F0.n) formatting)

2011-01-29  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libgfortran/47434
	* gfortran.dg/read_infnan_1.f90: Update test.
	* gfortran.dg/module_nan.f90: Update test.
	* gfortran.dg/char4_iunit_1.f03: Update test.
	* gfortran.dg/large_real_kind_1.f90: Update test.
	* gfortran.dg/real_const_3.f90: Update test.
	* gfortran.fortran-torture/execute/nan_inf_fmt.f90: Update test.

From-SVN: r169391

7 files changed, 27 insertions, 16 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f6f203d..cefa8a7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-29  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR libgfortran/47434
+	* gfortran.dg/read_infnan_1.f90: Update test.
+	* gfortran.dg/module_nan.f90: Update test.
+	* gfortran.dg/char4_iunit_1.f03: Update test.
+	* gfortran.dg/large_real_kind_1.f90: Update test.
+	* gfortran.dg/real_const_3.f90: Update test.
+	* gfortran.fortran-torture/execute/nan_inf_fmt.f90: Update test.
+
 2011-01-29  Dodji Seketeli  <dodji@redhat.com>
 
 	PR c++/47311
diff --git a/gcc/testsuite/gfortran.dg/char4_iunit_1.f03 b/gcc/testsuite/gfortran.dg/char4_iunit_1.f03
index 57b3f78..5b1b285 100644
--- a/gcc/testsuite/gfortran.dg/char4_iunit_1.f03
+++ b/gcc/testsuite/gfortran.dg/char4_iunit_1.f03
@@ -26,9 +26,9 @@ program char4_iunit_1
   write(string, *) 1.2345e-06, 4.2846e+10_8
   if (string .ne. 4_"  1.23450002E-06   42846000000.000000     ") call abort
   write(string, *) nan, inf
-  if (string .ne. 4_"             NaN       +Infinity           ") call abort
+  if (string .ne. 4_"             NaN        Infinity          ") call abort
   write(string, '(10x,f3.1,3x,f9.1)') nan, inf
-  if (string .ne. 4_"          NaN   +Infinity                 ") call abort
+  if (string .ne. 4_"          NaN    Infinity                 ") call abort
   write(string, *) (1.2, 3.4 )
   if (string .ne. 4_" (  1.2000000    ,  3.4000001    )        ") call abort
 end program char4_iunit_1
diff --git a/gcc/testsuite/gfortran.dg/large_real_kind_1.f90 b/gcc/testsuite/gfortran.dg/large_real_kind_1.f90
index 5c741ad..28e4067 100644
--- a/gcc/testsuite/gfortran.dg/large_real_kind_1.f90
+++ b/gcc/testsuite/gfortran.dg/large_real_kind_1.f90
@@ -56,7 +56,7 @@ program test
   call testoutput (-7.51e-100_k,-7.51e-100_8,15,'(F15.10)')
 
   x = huge(x)
-  call outputstring (2*x,'(F20.15)','           +Infinity')
+  call outputstring (2*x,'(F20.15)','            Infinity')
   call outputstring (-2*x,'(F20.15)','           -Infinity')
 
   write (c1,'(G20.10E5)') x
diff --git a/gcc/testsuite/gfortran.dg/module_nan.f90 b/gcc/testsuite/gfortran.dg/module_nan.f90
index ed841a8..202781f 100644
--- a/gcc/testsuite/gfortran.dg/module_nan.f90
+++ b/gcc/testsuite/gfortran.dg/module_nan.f90
@@ -19,7 +19,7 @@ program a
   if (log(abs(inf))  < huge(inf)) call abort()
   if (log(abs(minf)) < huge(inf)) call abort()
   if (.not. isnan(nan)) call abort()
-  write(str,*) inf
+  write(str,"(sp,f10.2)") inf
   if (adjustl(str) /= "+Infinity") call abort()
   write(str,*) minf
   if (adjustl(str) /= "-Infinity") call abort()
diff --git a/gcc/testsuite/gfortran.dg/read_infnan_1.f90 b/gcc/testsuite/gfortran.dg/read_infnan_1.f90
index 515a690..c5023e8 100644
--- a/gcc/testsuite/gfortran.dg/read_infnan_1.f90
+++ b/gcc/testsuite/gfortran.dg/read_infnan_1.f90
@@ -22,9 +22,9 @@ read(10,'(7f10.3)') x4
 rewind(10)
 read(10,'(7f10.3)') x8
 write (output, '("x4 =",7G6.0)') x4
-if (output.ne."x4 =  +Inf   NaN  +Inf   NaN  -Inf   NaN  +Inf") call abort
+if (output.ne."x4 =   Inf   NaN   Inf   NaN  -Inf   NaN   Inf") call abort
 write (output, '("x8 =",7G6.0)') x8
-if (output.ne."x8 =  +Inf   NaN  +Inf   NaN  -Inf   NaN  +Inf") call abort
+if (output.ne."x8 =   Inf   NaN   Inf   NaN  -Inf   NaN   Inf") call abort
 !print '("x4 =",7G6.0)', x4
 !print '("x8 =",7G6.0)', x8
 end program pr43298
diff --git a/gcc/testsuite/gfortran.dg/real_const_3.f90 b/gcc/testsuite/gfortran.dg/real_const_3.f90
index f428750..9f3f5d8 100644
--- a/gcc/testsuite/gfortran.dg/real_const_3.f90
+++ b/gcc/testsuite/gfortran.dg/real_const_3.f90
@@ -16,7 +16,7 @@ program main
   b = 1/exp(1000.0)
 
   write(str,*) a
-  if (trim(adjustl(str)) .ne. '+Infinity') call abort
+  if (trim(adjustl(str)) .ne. 'Infinity') call abort
 
   if (b .ne. 0.) call abort
 
@@ -36,7 +36,7 @@ program main
   if (trim(adjustl(str)) .ne. '-Infinity') call abort
 
   write(str,*) 3.0/0.
-  if (trim(adjustl(str)) .ne. '+Infinity') call abort
+  if (trim(adjustl(str)) .ne. 'Infinity') call abort
 
   write(str,*)  nan
   if (trim(adjustl(str)) .ne. 'NaN') call abort
@@ -48,7 +48,7 @@ program main
   if (trim(adjustl(str)) .ne. '(            NaN,            NaN)') call abort
 
   write(str,*) z3
-  if (trim(adjustl(str)) .ne. '(      +Infinity,      -Infinity)') call abort
+  if (trim(adjustl(str)) .ne. '(       Infinity,      -Infinity)') call abort
 
   write(str,*) z4
   if (trim(adjustl(str)) .ne. '(  0.0000000    , -0.0000000    )') call abort
diff --git a/gcc/testsuite/gfortran.fortran-torture/execute/nan_inf_fmt.f90 b/gcc/testsuite/gfortran.fortran-torture/execute/nan_inf_fmt.f90
index 22e17d1..2ded0cb 100644
--- a/gcc/testsuite/gfortran.fortran-torture/execute/nan_inf_fmt.f90
+++ b/gcc/testsuite/gfortran.fortran-torture/execute/nan_inf_fmt.f90
@@ -1,4 +1,5 @@
 !pr 12839- F2003 formatting of Inf /Nan 
+! Modified for PR47434
        implicit none
        character*40 l
        character*12 fmt
@@ -15,11 +16,11 @@
 ! check a field width = 0
        fmt = '(F0.0)'
        write(l,fmt=fmt)pos_inf
-       if (l.ne.'+Inf') call abort
+       if (l.ne.'Inf') call abort
        write(l,fmt=fmt)neg_inf
        if (l.ne.'-Inf') call abort
        write(l,fmt=fmt)nan
-       if (l.ne.' NaN') call abort
+       if (l.ne.'NaN') call abort
 
 ! check a field width < 3
        fmt = '(F2.0)'
@@ -42,7 +43,7 @@
 ! check a field width > 3
        fmt = '(F4.0)'
        write(l,fmt=fmt)pos_inf
-       if (l.ne.'+Inf') call abort
+       if (l.ne.' Inf') call abort
        write(l,fmt=fmt)neg_inf
        if (l.ne.'-Inf') call abort
        write(l,fmt=fmt)nan
@@ -51,7 +52,7 @@
 ! check a field width = 7
        fmt = '(F7.0)'
        write(l,fmt=fmt)pos_inf
-       if (l.ne.'   +Inf') call abort
+       if (l.ne.'    Inf') call abort
        write(l,fmt=fmt)neg_inf
        if (l.ne.'   -Inf') call abort
        write(l,fmt=fmt)nan
@@ -60,7 +61,7 @@
 ! check a field width = 8
        fmt = '(F8.0)'
        write(l,fmt=fmt)pos_inf
-       if (l.ne.'    +Inf') call abort
+       if (l.ne.'Infinity') call abort
        write(l,fmt=fmt)neg_inf
        if (l.ne.'    -Inf') call abort
        write(l,fmt=fmt)nan
@@ -69,7 +70,7 @@
 ! check a field width = 9
        fmt = '(F9.0)'
        write(l,fmt=fmt)pos_inf
-       if (l.ne.'+Infinity') call abort
+       if (l.ne.' Infinity') call abort
        write(l,fmt=fmt)neg_inf
        if (l.ne.'-Infinity') call abort
        write(l,fmt=fmt)nan
@@ -78,7 +79,7 @@
 ! check a field width = 14
        fmt = '(F14.0)'
        write(l,fmt=fmt)pos_inf
-       if (l.ne.'     +Infinity') call abort
+       if (l.ne.'      Infinity') call abort
        write(l,fmt=fmt)neg_inf
        if (l.ne.'     -Infinity') call abort
        write(l,fmt=fmt)nan