From: Kaveh R. Ghazi Date: Fri, 12 Jan 2007 15:36:16 +0000 (+0000) Subject: re PR fortran/30399 (testsuite failures in actual_array_constructor_2.f90 and actual... X-Git-Tag: releases/gcc-4.0.4~81 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b422f4e8ffb62a2ea31f1ea26187ecb70e987c4b;p=thirdparty%2Fgcc.git re PR fortran/30399 (testsuite failures in actual_array_constructor_2.f90 and actual_array_substr_2.f90) PR fortran/30399 * actual_array_constructor_2.f90 actual_array_substr_2.f90: Revert accidental checkin of these testcases. From-SVN: r120727 --- diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c7c18d125895..a7de460546e5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2007-01-12 Kaveh R. Ghazi + + PR fortran/30399 + * actual_array_constructor_2.f90 actual_array_substr_2.f90: Revert + accidental checkin of these testcases. + 2006-12-03 Lee Millward PR c++/29022 diff --git a/gcc/testsuite/gfortran.dg/actual_array_constructor_2.f90 b/gcc/testsuite/gfortran.dg/actual_array_constructor_2.f90 deleted file mode 100644 index 0a86b70d7bf1..000000000000 --- a/gcc/testsuite/gfortran.dg/actual_array_constructor_2.f90 +++ /dev/null @@ -1,34 +0,0 @@ -! { dg-do run } -! Tests the fix for pr28167, in which character array constructors -! with an implied do loop would cause an ICE, when used as actual -! arguments. -! -! Based on the testscase by Harald Anlauf -! - character(4), dimension(4) :: c1, c2 - integer m - m = 4 -! Test the original problem - call foo ((/( 'abcd',i=1,m )/), c2) - if (any(c2(:) .ne. (/'abcd','abcd', & - 'abcd','abcd'/))) call abort () - -! Now get a bit smarter - call foo ((/"abcd", "efgh", "ijkl", "mnop"/), c1) ! worked previously - call foo ((/(c1(i), i = m,1,-1)/), c2) ! was broken - if (any(c2(4:1:-1) .ne. c1)) call abort () - -! gfc_todo: Not Implemented: complex character array constructors - call foo ((/(c1(i)(i/2+1:i/2+2), i = 1,4)/), c2) ! Ha! take that..! - if (any (c2 .ne. (/"ab ","fg ","jk ","op "/))) call abort () - -! Check functions in the constructor - call foo ((/(achar(64+i)//achar(68+i)//achar(72+i)// & - achar(76+i),i=1,4 )/), c1) ! was broken - if (any (c1 .ne. (/"AEIM","BFJN","CGKO","DHLP"/))) call abort () -contains - subroutine foo (chr1, chr2) - character(*), dimension(:) :: chr1, chr2 - chr2 = chr1 - end subroutine foo -end \ No newline at end of file diff --git a/gcc/testsuite/gfortran.dg/actual_array_substr_2.f90 b/gcc/testsuite/gfortran.dg/actual_array_substr_2.f90 deleted file mode 100644 index 365557d6f57d..000000000000 --- a/gcc/testsuite/gfortran.dg/actual_array_substr_2.f90 +++ /dev/null @@ -1,44 +0,0 @@ -! { dg-do run } -! Tests the fix for pr28174, in which the fix for pr28118 was -! corrupting the character lengths of arrays that shared a -! character length structure. In addition, in developing the -! fix, it was noted that intent(out/inout) arguments were not -! getting written back to the calling scope. -! -! Based on the testscase by Harald Anlauf -! -program pr28174 - implicit none - character(len=12) :: teststring(2) = (/ "abc def ghij", & - "klm nop qrst" /) - character(len=12) :: a(2), b(2), c(2), d(2) - integer :: m = 7, n - a = teststring - b = a - c = a - d = a - n = m - 4 - -! Make sure that variable substring references work. - call foo (a(:)(m:m+5), c(:)(n:m+2), d(:)(5:9)) - if (any (a .ne. teststring)) call abort () - if (any (b .ne. teststring)) call abort () - if (any (c .ne. (/"ab456789#hij", & - "kl7654321rst"/))) call abort () - if (any (d .ne. (/"abc 23456hij", & - "klm 98765rst"/))) call abort () -contains - subroutine foo (w, x, y) - character(len=*), intent(in) :: w(:) - character(len=*), intent(inOUT) :: x(:) - character(len=*), intent(OUT) :: y(:) - character(len=12) :: foostring(2) = (/"0123456789#$" , & - "$#9876543210"/) -! This next is not required by the standard but tests the -! functioning of the gfortran implementation. -! if (all (x(:)(3:7) .eq. y)) call abort () - x = foostring (:)(5 : 4 + len (x)) - y = foostring (:)(3 : 2 + len (y)) - end subroutine foo -end program pr28174 -