From: Thomas Koenig <tkoenig@gcc.gnu.org>
Date: Sun, 25 Mar 2018 12:23:58 +0000 (+0000)
Subject: re PR fortran/84381 (replace non-std 'call abort' by 'stop 1' in gfortran testsuite)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9dd798f6b5785b5981d97419bc0e2a62c9701d26;p=gcc.git

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
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8b462a5e9eb..cbd5efcb16e 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 ba24966b72a..bd5a431996d 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 afd4f818597..396ebf9c1b3 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