diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2018-03-25 12:23:58 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2018-03-25 12:23:58 +0000 |
| commit | 9dd798f6b5785b5981d97419bc0e2a62c9701d26 (patch) | |
| tree | c871ce3852304817d9eb7ad9c6df009f6a8b8f15 /gcc | |
| parent | a2b471e494bf3942e35336227a846e332232d88c (diff) | |
| download | gcc-9dd798f6b5785b5981d97419bc0e2a62c9701d26.zip gcc-9dd798f6b5785b5981d97419bc0e2a62c9701d26.tar.gz gcc-9dd798f6b5785b5981d97419bc0e2a62c9701d26.tar.bz2 | |
re PR fortran/84381 (replace non-std 'call abort' by 'stop 1' in gfortran testsuite)
2018-03-25 Thomas Koenig <tkoenig@gcc.gnu.org>
Neil Carlson <neil.n.carlson@gmail.com>
PR fortran/84381
* gfortran.dg/literal_character_constant_1.inc: Replace
call abort by STOP n.
* gfortran.dg/overload_1.f90: Likewise.
Co-Authored-By: Neil Carlson <neil.n.carlson@gmail.com>
From-SVN: r258844
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/literal_character_constant_1.inc | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/overload_1.f90 | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8b462a5..cbd5efc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2018-03-25 Thomas Koenig <tkoenig@gcc.gnu.org> + Neil Carlson <neil.n.carlson@gmail.com> + + PR fortran/84381 + * gfortran.dg/literal_character_constant_1.inc: Replace + call abort by STOP n. + * gfortran.dg/overload_1.f90: Likewise. + 2018-03-25 Seth Johnson <johnsonsr@ornl.gov> Dominique d'Humieres <dominiq@gcc.gnu.org> diff --git a/gcc/testsuite/gfortran.dg/literal_character_constant_1.inc b/gcc/testsuite/gfortran.dg/literal_character_constant_1.inc index ba24966..bd5a431 100644 --- a/gcc/testsuite/gfortran.dg/literal_character_constant_1.inc +++ b/gcc/testsuite/gfortran.dg/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 diff --git a/gcc/testsuite/gfortran.dg/overload_1.f90 b/gcc/testsuite/gfortran.dg/overload_1.f90 index afd4f81..396ebf9 100644 --- a/gcc/testsuite/gfortran.dg/overload_1.f90 +++ b/gcc/testsuite/gfortran.dg/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 1 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 2 end subroutine checku end program main |