[Bug fortran/84381] replace non-std 'call abort' by 'stop 1' in gfortran testsuite
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84381 Thomas Koenig changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #19 from Thomas Koenig --- Now fixed (finally, I hope). At least I didn't find anything else.
[Bug fortran/84381] replace non-std 'call abort' by 'stop 1' in gfortran testsuite
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84381 --- Comment #18 from Thomas Koenig --- Author: tkoenig Date: Sun Mar 25 16:00:52 2018 New Revision: 258846 URL: https://gcc.gnu.org/viewcvs?rev=258846&root=gcc&view=rev Log: 2018-03-25 Thomas Koenig PR fortran/84381 * testsuite/libgomp.fortran/aligned1.f03: Replace non-standard call abort by STOP n. * testsuite/libgomp.fortran/alloc-comp-1.f90: Likewise. * testsuite/libgomp.fortran/alloc-comp-2.f90: Likewise. * testsuite/libgomp.fortran/alloc-comp-3.f90: Likewise. * testsuite/libgomp.fortran/allocatable1.f90: Likewise. * testsuite/libgomp.fortran/allocatable10.f90: Likewise. * testsuite/libgomp.fortran/allocatable11.f90: Likewise. * testsuite/libgomp.fortran/allocatable12.f90: Likewise. * testsuite/libgomp.fortran/allocatable2.f90: Likewise. * testsuite/libgomp.fortran/allocatable3.f90: Likewise. * testsuite/libgomp.fortran/allocatable4.f90: Likewise. * testsuite/libgomp.fortran/allocatable5.f90: Likewise. * testsuite/libgomp.fortran/allocatable6.f90: Likewise. * testsuite/libgomp.fortran/allocatable7.f90: Likewise. * testsuite/libgomp.fortran/allocatable8.f90: Likewise. * testsuite/libgomp.fortran/allocatable9.f90: Likewise. * testsuite/libgomp.fortran/appendix-a/a.18.1.f90: Likewise. * testsuite/libgomp.fortran/appendix-a/a.19.1.f90: Likewise. * testsuite/libgomp.fortran/associate1.f90: Likewise. * testsuite/libgomp.fortran/associate2.f90: Likewise. * testsuite/libgomp.fortran/associate3.f90: Likewise. * testsuite/libgomp.fortran/cancel-do-1.f90: Likewise. * testsuite/libgomp.fortran/cancel-do-2.f90: Likewise. * testsuite/libgomp.fortran/cancel-parallel-1.f90: Likewise. * testsuite/libgomp.fortran/cancel-sections-1.f90: Likewise. * testsuite/libgomp.fortran/cancel-taskgroup-2.f90: Likewise. * testsuite/libgomp.fortran/character1.f90: Likewise. * testsuite/libgomp.fortran/character2.f90: Likewise. * testsuite/libgomp.fortran/collapse1.f90: Likewise. * testsuite/libgomp.fortran/collapse2.f90: Likewise. * testsuite/libgomp.fortran/collapse3.f90: Likewise. * testsuite/libgomp.fortran/collapse4.f90: Likewise. * testsuite/libgomp.fortran/crayptr1.f90: Likewise. * testsuite/libgomp.fortran/crayptr2.f90: Likewise. * testsuite/libgomp.fortran/crayptr3.f90: Likewise. * testsuite/libgomp.fortran/declare-simd-1.f90: Likewise. * testsuite/libgomp.fortran/declare-simd-3.f90: Likewise. * testsuite/libgomp.fortran/declare-target-2.f90: Likewise. * testsuite/libgomp.fortran/depend-1.f90: Likewise. * testsuite/libgomp.fortran/depend-2.f90: Likewise. * testsuite/libgomp.fortran/depend-3.f90: Likewise. * testsuite/libgomp.fortran/do1.f90: Likewise. * testsuite/libgomp.fortran/do2.f90: Likewise. * testsuite/libgomp.fortran/doacross1.f90: Likewise. * testsuite/libgomp.fortran/doacross2.f90: Likewise. * testsuite/libgomp.fortran/doacross3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/array_sections-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/array_sections-4.f90: Likewise. * testsuite/libgomp.fortran/examples-4/async_target-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/async_target-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/declare_target-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/declare_target-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/declare_target-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/declare_target-4.f90: Likewise. * testsuite/libgomp.fortran/examples-4/declare_target-5.f90: Likewise. * testsuite/libgomp.fortran/examples-4/device-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/device-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/device-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-4.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-5.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-6.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-7.f90: Likewise. * testsuite/libgomp.fortran/examples-4/simd-8.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target-1.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target-2.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target-3.f90: Likewise. * testsuite/libgomp.fortran/examples-4/target-4.f90: Likewise. * testsuit
[Bug fortran/84381] replace non-std 'call abort' by 'stop 1' in gfortran testsuite
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84381 --- Comment #17 from Thomas Koenig --- Author: tkoenig Date: Sun Mar 25 12:46:31 2018 New Revision: 258845 URL: https://gcc.gnu.org/viewcvs?rev=258845&root=gcc&view=rev Log: 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. Modified: trunk/gcc/testsuite/gfortran.dg/bound_simplification_3.f90 trunk/gcc/testsuite/gfortran.dg/bound_simplification_4.f90 trunk/gcc/testsuite/gfortran.dg/bound_simplification_5.f90 trunk/gcc/testsuite/gfortran.dg/bound_simplification_6.f90 trunk/gcc/testsuite/gfortran.dg/complex_intrinsic_7.f90 trunk/gcc/testsuite/gfortran.dg/dot_product_2.f90 trunk/gcc/testsuite/gfortran.dg/iso_fortran_env_5.f90 trunk/gcc/testsuite/gfortran.dg/shape_7.f90 trunk/gcc/testsuite/gfortran.dg/storage_size_4.f90 trunk/gcc/testsuite/gfortran.dg/string_length_2.f90
[Bug fortran/84381] replace non-std 'call abort' by 'stop 1' in gfortran testsuite
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84381 Dominique d'Humieres changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- --- Comment #16 from Dominique d'Humieres --- > Fixed (completely this time, one can hope). Nope: see comments 9 and 10.
[Bug fortran/84381] replace non-std 'call abort' by 'stop 1' in gfortran testsuite
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84381 Thomas Koenig changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #15 from Thomas Koenig --- Fixed (completely this time, one can hope).
[Bug fortran/84381] replace non-std 'call abort' by 'stop 1' in gfortran testsuite
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84381 --- Comment #14 from Thomas Koenig --- Author: tkoenig Date: Sun Mar 25 12:23:58 2018 New Revision: 258844 URL: https://gcc.gnu.org/viewcvs?rev=258844&root=gcc&view=rev Log: 2018-03-25 Thomas Koenig Neil Carlson PR fortran/84381 * gfortran.dg/literal_character_constant_1.inc: Replace call abort by STOP n. * gfortran.dg/overload_1.f90: Likewise. Modified: trunk/gcc/testsuite/ChangeLog trunk/gcc/testsuite/gfortran.dg/literal_character_constant_1.inc trunk/gcc/testsuite/gfortran.dg/overload_1.f90
[Bug fortran/84381] replace non-std 'call abort' by 'stop 1' in gfortran testsuite
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84381 --- Comment #13 from Neil Carlson --- And one more missed file due to a line split between the "call" and "abort". Here's the patch: diff --git a/overload_1.f90 b/overload_1.f90 index afd4f81..66fbea4 100644 --- a/overload_1.f90 +++ b/overload_1.f90 @@ -162,8 +162,7 @@ contains r2 = (/ a.eq.b, a.ne.b, a.lt.b, a.le.b, a.gt.b, a.ge.b /) if (any (r1.neqv.r2)) STOP 1 if (any (r1.neqv. & - (/ .false.,.true.,.true., .true., .false.,.false. /) )) call& - & abort + (/ .false.,.true.,.true., .true., .false.,.false. /) )) STOP 3 end subroutine checkt subroutine checku @@ -177,7 +176,6 @@ contains r2 = (/ a.eq.b, a.ne.b, a.lt.b, a.le.b, a.gt.b, a.ge.b /) if (any (r1.neqv.r2)) STOP 2 if (any (r1.neqv. & - (/ .false.,.true.,.true., .true., .false.,.false. /) )) call& - & abort + (/ .false.,.true.,.true., .true., .false.,.false. /) )) STOP 4 end subroutine checku end program main
[Bug fortran/84381] replace non-std 'call abort' by 'stop 1' in gfortran testsuite
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84381 --- Comment #12 from Neil Carlson --- Argh... here's the *correct* patch diff --git a/literal_character_constant_1.inc b/literal_character_constant_1.inc index ba24966..40375cd 100644 --- a/literal_character_constant_1.inc +++ b/literal_character_constant_1.inc @@ -9,12 +9,12 @@ c A tab is between 8 and 9. write(fil,'(a)') c #ifdef LL_NONE if(fil.ne. "12345678 9") - & call abort + & stop 1 #else if(fil.ne. &"1234567 8 9" &) - & call abort + & stop 2 #endif end
[Bug fortran/84381] replace non-std 'call abort' by 'stop 1' in gfortran testsuite
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84381 --- Comment #11 from Neil Carlson --- One more missed file, an include file included by literal_character_constant_1_x.F. Here's the patch: diff --git a/literal_character_constant_1.inc b/literal_character_constant_1.inc index ba24966..8beea79 100644 --- a/literal_character_constant_1.inc +++ b/literal_character_constant_1.inc @@ -9,12 +9,12 @@ c A tab is between 8 and 9. write(fil,'(a)') c #ifdef LL_NONE if(fil.ne. "12345678 9") - & call abort + & call stop 1 #else if(fil.ne. &"1234567 8 9" &) - & call abort + & call stop 2 #endif end
[Bug fortran/84381] replace non-std 'call abort' by 'stop 1' in gfortran testsuite
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84381
--- Comment #10 from Dominique d'Humieres ---
There are also a few tests that are scanning tree-dump for not "abort".
I have spotted:
gfortran.dg/bound_simplification_3.f90
gfortran.dg/bound_simplification_4.f90
gfortran.dg/bound_simplification_5.f90
gfortran.dg/bound_simplification_6.f90
gfortran.dg/complex_intrinsic_7.f90
gfortran.dg/dot_product_2.f90
gfortran.dg/iso_fortran_env_5.f90
gfortran.dg/shape_7.f90
gfortran.dg/storage_size_4.f90
and may be
gfortran.dg/string_length_2.f90
IMO the "abort" should be replaced with "STOP" ("stop"?).
Note that I do not guarantee that the above list is exhaustive.
[Bug fortran/84381] replace non-std 'call abort' by 'stop 1' in gfortran testsuite
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84381
Thomas Schwinge changed:
What|Removed |Added
Status|RESOLVED|REOPENED
CC||tschwinge at gcc dot gnu.org
Resolution|FIXED |---
--- Comment #9 from Thomas Schwinge ---
I suppose the same changes ("abort" -> "stop") should also be applied to the
libgomp Fortran test cases?
$ git grep -i abort upstream/trunk --
libgomp/testsuite/libgomp.{,oacc-}fortran/ | wc -l
2016
$ git grep -i fall-intrinsics upstream/trunk --
libgomp/testsuite/libgomp.{,oacc-}fortran/ | wc -l
2
Thus re-opened.
[Bug fortran/84381] replace non-std 'call abort' by 'stop 1' in gfortran testsuite
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84381 --- Comment #8 from janus at gcc dot gnu.org --- Author: janus Date: Sun Feb 18 12:29:09 2018 New Revision: 257789 URL: https://gcc.gnu.org/viewcvs?rev=257789&root=gcc&view=rev Log: 2018-02-18 Janus Weil PR fortran/84381 * gfortran.dg/io_real_boz2.f90: Remove option "-fall-intrinsics". * gfortran.dg/pointer_intent_3.f90: Ditto. * gfortran.dg/proc_ptr_common_1.f90: Ditto. * gfortran.dg/protected_3.f90: Ditto. * gfortran.dg/protected_4.f90: Ditto. * gfortran.dg/protected_5.f90: Ditto. * gfortran.dg/protected_6.f90: Ditto. Modified: trunk/gcc/testsuite/ChangeLog trunk/gcc/testsuite/gfortran.dg/io_real_boz2.f90 trunk/gcc/testsuite/gfortran.dg/pointer_intent_3.f90 trunk/gcc/testsuite/gfortran.dg/proc_ptr_common_1.f90 trunk/gcc/testsuite/gfortran.dg/protected_3.f90 trunk/gcc/testsuite/gfortran.dg/protected_4.f90 trunk/gcc/testsuite/gfortran.dg/protected_5.f90 trunk/gcc/testsuite/gfortran.dg/protected_6.f90
[Bug fortran/84381] replace non-std 'call abort' by 'stop 1' in gfortran testsuite
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84381 Thomas Koenig changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #7 from Thomas Koenig --- Author: tkoenig Date: Sat Feb 17 14:05:34 2018 New Revision: 257782 URL: https://gcc.gnu.org/viewcvs?rev=257782&root=gcc&view=rev Log: 2018-02-17 Thomas Koenig PR fortran/84381 * gfortran.dg/abort_shoulfail.f90: New test. * gcc.target/powerpc/ppc-fortran/pr80108-1.f90: Replace CALL ABORT by STOP n. * gfortran.dg/PR19754_2.f90: Likewise. * gfortran.dg/PR19872.f: Likewise. ... and so on. The full ChangeLog was rejected because it was too long :-)
[Bug fortran/84381] replace non-std 'call abort' by 'stop 1' in gfortran testsuite
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84381
--- Comment #6 from Thomas Koenig ---
(In reply to Neil Carlson from comment #5)
> Thomas, I saw you generated a patch with "stop n". I'd love to see how you
> did it -- the regexp and counting magic.
At first, I tried to find the all-inclusive regexp to do this, but
that didn't work fast enough, so I settled for running different
scripts for different cases. I didn't actually save all the
scripts.
The first one was
#! /usr/bin/perl
$n = 1;
$abort = "call *abort *([(] *[)])?";
while (<>)
{
if (/$abort/) {
s/$abort/STOP $n/;
$n++;
}
print;
}
and another one
$n = 1;
while (<>)
{
if (/call\s*abort$/i) {
s/call\s*abort/STOP $n/i;
$n++;
}
print;
}
and invoked them with
find . -type f -name '*.[fF]*' -exec perl -i ./c2.pl '{}' ';'
Not the most general solution, but it got me there :-)
[Bug fortran/84381] replace non-std 'call abort' by 'stop 1' in gfortran testsuite
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84381 --- Comment #5 from Neil Carlson --- Thomas, I saw you generated a patch with "stop n". I'd love to see how you did it -- the regexp and counting magic.
[Bug fortran/84381] replace non-std 'call abort' by 'stop 1' in gfortran testsuite
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84381 Thomas Koenig changed: What|Removed |Added Status|UNCONFIRMED |NEW Last reconfirmed||2018-02-15 Component|testsuite |fortran Ever confirmed|0 |1 --- Comment #4 from Thomas Koenig --- Better as a fortran issue - I searched for it in the Fortran bugs, and missed it at first. Confirming.
