From 22b128c53ba8b608d0e72c923313071e27b5a844 Mon Sep 17 00:00:00 2001 From: Dominique d'Humieres Date: Sun, 4 Feb 2018 14:44:52 +0100 Subject: [PATCH] re PR fortran/84094 (several correctness issues in gfortran.dg) 2018-02-04 Dominique d'Humieres PR fortran/84094 * gfortran.dg/associate_23.f90: Fix invalid code. * gfortran.dg/intrinsic_actual_4.f90: Likewise. * gfortran.dg/matmul_3.f90: Likewise. * gfortran.dg/transfer_array_intrinsic_2.f90: Likewise. From-SVN: r257364 --- gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/gfortran.dg/associate_23.f90 | 2 +- gcc/testsuite/gfortran.dg/intrinsic_actual_4.f90 | 1 + gcc/testsuite/gfortran.dg/matmul_3.f90 | 2 +- gcc/testsuite/gfortran.dg/transfer_array_intrinsic_2.f90 | 2 +- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3c93cba9db1..196711b2669 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2018-02-04 Dominique d'Humieres + + PR fortran/84094 + * gfortran.dg/associate_23.f90: Fix invalid code. + * gfortran.dg/intrinsic_actual_4.f90: Likewise. + * gfortran.dg/matmul_3.f90: Likewise. + * gfortran.dg/transfer_array_intrinsic_2.f90: Likewise. + 2018-02-04 Paul Thomas PR fortran/84115 diff --git a/gcc/testsuite/gfortran.dg/associate_23.f90 b/gcc/testsuite/gfortran.dg/associate_23.f90 index b4d58ffd2b7..fc07671676d 100644 --- a/gcc/testsuite/gfortran.dg/associate_23.f90 +++ b/gcc/testsuite/gfortran.dg/associate_23.f90 @@ -27,7 +27,7 @@ program test_this ! Found to be failing during debugging ASSOCIATE(should_work=>char_var_dim(1:2)) - should_work = ["test SUCCESFUL", "test_SUCCESFUL", "test.SUCCESFUL"] + should_work = ["test SUCCESFUL", "test_SUCCESFUL"] write (buffer, *) should_work(:)(5:14) END ASSOCIATE diff --git a/gcc/testsuite/gfortran.dg/intrinsic_actual_4.f90 b/gcc/testsuite/gfortran.dg/intrinsic_actual_4.f90 index 4ba4b79c72d..d5cd99c57ac 100644 --- a/gcc/testsuite/gfortran.dg/intrinsic_actual_4.f90 +++ b/gcc/testsuite/gfortran.dg/intrinsic_actual_4.f90 @@ -13,6 +13,7 @@ implicit none integer i + intrinsic len i = len ("123") call sub (len, "abcdef") end diff --git a/gcc/testsuite/gfortran.dg/matmul_3.f90 b/gcc/testsuite/gfortran.dg/matmul_3.f90 index 65290feccaa..e8512330b5e 100644 --- a/gcc/testsuite/gfortran.dg/matmul_3.f90 +++ b/gcc/testsuite/gfortran.dg/matmul_3.f90 @@ -22,7 +22,7 @@ iX2(1:n,1) = matmul( iB(2,1:n),iC(1:n,1:n) ) ! Whereas, we should have 8, 8, 99 - if (any (iX1(1:n,1) .ne. (/8, 8, 99/))) call abort () + if (any (iX1(1:n+1,1) .ne. (/8, 8, 99/))) call abort () if (any (iX1 .ne. iX2)) call abort () ! Make sure that the fix does not break transpose temporaries. diff --git a/gcc/testsuite/gfortran.dg/transfer_array_intrinsic_2.f90 b/gcc/testsuite/gfortran.dg/transfer_array_intrinsic_2.f90 index aaa10f8a4f5..ad2293d1e04 100644 --- a/gcc/testsuite/gfortran.dg/transfer_array_intrinsic_2.f90 +++ b/gcc/testsuite/gfortran.dg/transfer_array_intrinsic_2.f90 @@ -88,7 +88,7 @@ contains ch(1:2) = transfer (y, ch, 2) if (any (ch(1:2) .ne. (/"ABCD","EFGH"/))) call abort () - z = transfer (ch, y) + z = transfer (ch, y, 2) if (any (y(1:2) .ne. z)) call abort () end subroutine test2 -- 2.30.2