From 32e38f64001f16bd72dd084d76ccc9d57cf1057b Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Sun, 25 Mar 2018 12:46:31 +0000 Subject: [PATCH] re PR fortran/84381 (replace non-std 'call abort' by 'stop 1' in gfortran testsuite) 2018-03-24 Thomas Koenig PR fortran/84381 * gfortran.dg/bound_simplification_3.f90: Replace "abort" by "_gfortran_stop" in scan-tree-dump-times directive. * gfortran.dg/bound_simplification_4.f90: Likewise. * gfortran.dg/bound_simplification_5.f90: Likewise. * gfortran.dg/bound_simplification_6.f90: Likewise. * gfortran.dg/complex_intrinsic_7.f90: Likewise. * gfortran.dg/dot_product_2.f90: Likewise. * gfortran.dg/iso_fortran_env_5.f90: Likewise. * gfortran.dg/minmaxloc_12.f90: Likewise. * gfortran.dg/minmaxloc_13.f90: Likewise. * gfortran.dg/parameter_array_element_3.f90: Likewise. * gfortran.dg/shape_7.f90: Likewise. * gfortran.dg/storage_size_4.f90: Likewise. * gfortran.dg/string_length_2.f90: Likewise. From-SVN: r258845 --- gcc/testsuite/gfortran.dg/bound_simplification_3.f90 | 2 +- gcc/testsuite/gfortran.dg/bound_simplification_4.f90 | 2 +- gcc/testsuite/gfortran.dg/bound_simplification_5.f90 | 2 +- gcc/testsuite/gfortran.dg/bound_simplification_6.f90 | 2 +- gcc/testsuite/gfortran.dg/complex_intrinsic_7.f90 | 2 +- gcc/testsuite/gfortran.dg/dot_product_2.f90 | 2 +- gcc/testsuite/gfortran.dg/iso_fortran_env_5.f90 | 2 +- gcc/testsuite/gfortran.dg/shape_7.f90 | 2 +- gcc/testsuite/gfortran.dg/storage_size_4.f90 | 2 +- gcc/testsuite/gfortran.dg/string_length_2.f90 | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gcc/testsuite/gfortran.dg/bound_simplification_3.f90 b/gcc/testsuite/gfortran.dg/bound_simplification_3.f90 index 2a03f3b7f67..66ed5f11c8b 100644 --- a/gcc/testsuite/gfortran.dg/bound_simplification_3.f90 +++ b/gcc/testsuite/gfortran.dg/bound_simplification_3.f90 @@ -19,4 +19,4 @@ program testit end program testit ! { dg-final { scan-tree-dump-times "bound" 0 "original" } } -! { dg-final { scan-tree-dump-times "abort" 0 "original" } } +! { dg-final { scan-tree-dump-times "_gfortran_stop" 0 "original" } } diff --git a/gcc/testsuite/gfortran.dg/bound_simplification_4.f90 b/gcc/testsuite/gfortran.dg/bound_simplification_4.f90 index 521647289cd..205c1e90969 100644 --- a/gcc/testsuite/gfortran.dg/bound_simplification_4.f90 +++ b/gcc/testsuite/gfortran.dg/bound_simplification_4.f90 @@ -26,4 +26,4 @@ ! no simplification for ucobound(e{,%c}, dim=2) end ! { dg-final { scan-tree-dump-not "bound" "original" } } -! { dg-final { scan-tree-dump-not "abort" "original" } } +! { dg-final { scan-tree-dump-not "_gfortran_stop" "original" } } diff --git a/gcc/testsuite/gfortran.dg/bound_simplification_5.f90 b/gcc/testsuite/gfortran.dg/bound_simplification_5.f90 index 77563b29e59..38670c26076 100644 --- a/gcc/testsuite/gfortran.dg/bound_simplification_5.f90 +++ b/gcc/testsuite/gfortran.dg/bound_simplification_5.f90 @@ -71,4 +71,4 @@ contains end subroutine end -! { dg-final { scan-tree-dump-not "abort" "original" } } +! { dg-final { scan-tree-dump-not "_gfortran_stop" "original" } } diff --git a/gcc/testsuite/gfortran.dg/bound_simplification_6.f90 b/gcc/testsuite/gfortran.dg/bound_simplification_6.f90 index 2480f2806fd..31a9bab590c 100644 --- a/gcc/testsuite/gfortran.dg/bound_simplification_6.f90 +++ b/gcc/testsuite/gfortran.dg/bound_simplification_6.f90 @@ -23,4 +23,4 @@ MODULE qs_integrate_potential_low END SUBROUTINE integrate_general_opt END MODULE qs_integrate_potential_low ! { dg-final { scan-tree-dump-not "bound" "original" } } -! { dg-final { scan-tree-dump-not "abort" "original" } } +! { dg-final { scan-tree-dump-not "_gfortran_stop" "original" } } diff --git a/gcc/testsuite/gfortran.dg/complex_intrinsic_7.f90 b/gcc/testsuite/gfortran.dg/complex_intrinsic_7.f90 index 3cc67bd8776..0737adaf099 100644 --- a/gcc/testsuite/gfortran.dg/complex_intrinsic_7.f90 +++ b/gcc/testsuite/gfortran.dg/complex_intrinsic_7.f90 @@ -40,4 +40,4 @@ if (abs(tanh(z80_0) - cmplx(0.0_8,0.0_8,8)) > eps8) STOP 15 if (abs(tanh(z81_1) - cmplx(1.0839233273386946_8,0.27175258531951174_8,8)) > eps8) STOP 16 end -! { dg-final { scan-tree-dump-times "abort" 0 "original" } } +! { dg-final { scan-tree-dump-times "_gfortran_stop" 0 "original" } } diff --git a/gcc/testsuite/gfortran.dg/dot_product_2.f90 b/gcc/testsuite/gfortran.dg/dot_product_2.f90 index f40122b8d13..e59497f04a6 100644 --- a/gcc/testsuite/gfortran.dg/dot_product_2.f90 +++ b/gcc/testsuite/gfortran.dg/dot_product_2.f90 @@ -34,4 +34,4 @@ if (ANY (MATMUL ((/ (1.0, 2.0), (2.0, 3.0) /), & end -! { dg-final { scan-tree-dump-not "abort" "original" } } +! { dg-final { scan-tree-dump-not "_gfortran_stop" "original" } } diff --git a/gcc/testsuite/gfortran.dg/iso_fortran_env_5.f90 b/gcc/testsuite/gfortran.dg/iso_fortran_env_5.f90 index efe012143ca..8e6651495fc 100644 --- a/gcc/testsuite/gfortran.dg/iso_fortran_env_5.f90 +++ b/gcc/testsuite/gfortran.dg/iso_fortran_env_5.f90 @@ -22,5 +22,5 @@ if (STAT_LOCKED == STAT_UNLOCKED) STOP 5 end -! { dg-final { scan-tree-dump-times "abort" 0 "original" } } +! { dg-final { scan-tree-dump-times "_gfortran_stop" 0 "original" } } diff --git a/gcc/testsuite/gfortran.dg/shape_7.f90 b/gcc/testsuite/gfortran.dg/shape_7.f90 index 7b0bed7bd66..84f671f9c4f 100644 --- a/gcc/testsuite/gfortran.dg/shape_7.f90 +++ b/gcc/testsuite/gfortran.dg/shape_7.f90 @@ -27,5 +27,5 @@ Program Main if (any (ubound((X2)) /= [5,2])) STOP 12 End Program Main -! { dg-final { scan-tree-dump-times "abort" 0 "original" } } +! { dg-final { scan-tree-dump-times "_gfortran_stop" 0 "original" } } diff --git a/gcc/testsuite/gfortran.dg/storage_size_4.f90 b/gcc/testsuite/gfortran.dg/storage_size_4.f90 index 8650b90f79d..820048cbe9c 100644 --- a/gcc/testsuite/gfortran.dg/storage_size_4.f90 +++ b/gcc/testsuite/gfortran.dg/storage_size_4.f90 @@ -19,4 +19,4 @@ subroutine S ( A ) esize = ( storage_size(a) + 7 ) / 8 end -! { dg-final { scan-tree-dump-not "abort" "original" } } +! { dg-final { scan-tree-dump-not "_gfortran_stop" "original" } } diff --git a/gcc/testsuite/gfortran.dg/string_length_2.f90 b/gcc/testsuite/gfortran.dg/string_length_2.f90 index 96afa81f804..7d244a0a367 100644 --- a/gcc/testsuite/gfortran.dg/string_length_2.f90 +++ b/gcc/testsuite/gfortran.dg/string_length_2.f90 @@ -28,4 +28,4 @@ program main if (len(c( i*(i+1) - 2 : (i+1)*i )) /= 3) STOP 17! Case 17 if (len(c( (i-2)*(i-3) : (i-3)*(i-2) )) /= 1) STOP 18! Case 18 end program main -! { dg-final { scan-tree-dump-times "_abort" 0 "original" } } +! { dg-final { scan-tree-dump-times "_gfortran_stop" 0 "original" } } -- 2.30.2