[Patch, committed] Fix some wrong testcases in gfortran.dg

[Thomas Koenig]

Committed as obvious to mainline and 4.0 after verifying that
the test cases still pass.

	Thomas

2005-07-30  Thomas Koenig  <Thomas.Koenig@online.de>

        * gfortran.dg/comma_format_extension_4.f:  Adjust length
        of string for format.
        * gfortran.dg/der_array_io_1.f:  Replace illegal internal
        print statement with internal write.
        * gfortran.dg/der_array_io_2.f:  Likewise.
        * gfortran.dg/der_array_io_3.f:  Likewise.

-------------- next part --------------
Index: comma_format_extension_4.f
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gfortran.dg/comma_format_extension_4.f,v
retrieving revision 1.2
diff -c -p -r1.2 comma_format_extension_4.f
*** comma_format_extension_4.f	23 Jul 2005 03:26:27 -0000	1.2
--- comma_format_extension_4.f	30 Jul 2005 20:49:46 -0000
***************
*** 2,8 ****
  ! Note the missing , before i1 in the format.
  ! { dg-do run }
  ! { dg-options "" }
!       character*5 c
        write (c,1001) 1
        if (c .ne. '    1 ') call abort
  
--- 2,8 ----
  ! Note the missing , before i1 in the format.
  ! { dg-do run }
  ! { dg-options "" }
!       character*6 c
        write (c,1001) 1
        if (c .ne. '    1 ') call abort
  
Index: der_array_io_1.f90
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gfortran.dg/der_array_io_1.f90,v
retrieving revision 1.1
diff -c -p -r1.1 der_array_io_1.f90
*** der_array_io_1.f90	16 Sep 2004 13:29:56 -0000	1.1
--- der_array_io_1.f90	30 Jul 2005 20:49:46 -0000
*************** program main
*** 17,24 ****
       foo(i)%z = 100*i+40
    enddo
  
!   print (buf1, '(20i4)'), foo
!   print (buf2, '(20i4)'), (foo(i)%x, (foo(i)%y(j), j=1,3), foo(i)%z, i=1,4)
  
    if (buf1.ne.buf2) call abort
  end program main
--- 17,24 ----
       foo(i)%z = 100*i+40
    enddo
  
!   write (buf1, '(20i4)')  foo
!   write (buf2, '(20i4)')  (foo(i)%x, (foo(i)%y(j), j=1,3), foo(i)%z, i=1,4)
  
    if (buf1.ne.buf2) call abort
  end program main
Index: der_array_io_2.f90
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gfortran.dg/der_array_io_2.f90,v
retrieving revision 1.1
diff -c -p -r1.1 der_array_io_2.f90
*** der_array_io_2.f90	16 Sep 2004 13:29:56 -0000	1.1
--- der_array_io_2.f90	30 Jul 2005 20:49:46 -0000
*************** program main
*** 23,29 ****
    foo(2)%z = 50
    foo(2)%a = "HELLO WORLD"
  
!   print (buf1,*), foo
!   print (buf2,*), ((foo(i)%x(j),j=1,3), (foo(i)%y(j),j=1,4), (foo(i)%z(j),j=1,5), (foo(i)%a(j),j=1,3), i=1,2)
    if (buf1.ne.buf2) call abort
  end program main
--- 23,29 ----
    foo(2)%z = 50
    foo(2)%a = "HELLO WORLD"
  
!   write (buf1,*)  foo
!   write (buf2,*) ((foo(i)%x(j),j=1,3), (foo(i)%y(j),j=1,4), (foo(i)%z(j),j=1,5), (foo(i)%a(j),j=1,3), i=1,2)
    if (buf1.ne.buf2) call abort
  end program main
Index: der_array_io_3.f90
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gfortran.dg/der_array_io_3.f90,v
retrieving revision 1.1
diff -c -p -r1.1 der_array_io_3.f90
*** der_array_io_3.f90	16 Sep 2004 13:29:56 -0000	1.1
--- der_array_io_3.f90	30 Jul 2005 20:49:46 -0000
*************** program main
*** 7,13 ****
    end type foo_type
    type (foo_type) :: foo
  !  foo = foo_type("hello world ")
!   print (buf1,*), foo
!   print (buf2,*), (foo%name(i), i=1,13)
    if (buf1.ne.buf2) call abort
  end program main
--- 7,13 ----
    end type foo_type
    type (foo_type) :: foo
  !  foo = foo_type("hello world ")
!   write (buf1,*)  foo
!   write (buf2,*)  (foo%name(i), i=1,13)
    if (buf1.ne.buf2) call abort
  end program main