Merge from trunk revision 257954.gccgo

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gccgo@257955 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 8 insertions, 8 deletions

diff --git a/gcc/testsuite/gfortran.dg/deferred_character_15.f90 b/gcc/testsuite/gfortran.dg/deferred_character_15.f90
index c641c1fb87b..fd0ff9b1bf4 100644
--- a/gcc/testsuite/gfortran.dg/deferred_character_15.f90
+++ b/gcc/testsuite/gfortran.dg/deferred_character_15.f90
@@ -7,13 +7,13 @@
 program tester
   character(LEN=:), allocatable :: S
   S= test(2)
-  if (len(S) .ne. 4) call abort
-  if (S .ne. "test") call abort
+  if (len(S) .ne. 4) STOP 1
+  if (S .ne. "test") STOP 2
   if (allocated (S)) deallocate (S)
 
   S= test2(2)
-  if (len(S) .ne. 4) call abort
-  if (S .ne. "test") call abort
+  if (len(S) .ne. 4) STOP 3
+  if (S .ne. "test") STOP 4
   if (allocated (S)) deallocate (S)
 contains
   function test(alen)
@@ -25,8 +25,8 @@ contains
     end do
 !       This line would print nothing when compiled with -O1 and higher.
 !       print *, len(test),test
-    if (len(test) .ne. 4) call abort
-    if (test .ne. "test") call abort
+    if (len(test) .ne. 4) STOP 5
+    if (test .ne. "test") STOP 6
   end function test
 
   function test2(alen) result (test)
@@ -38,7 +38,7 @@ contains
     end do
 !       This worked before the fix.
 !       print *, len(test),test
-    if (len(test) .ne. 4) call abort
-    if (test .ne. "test") call abort
+    if (len(test) .ne. 4) STOP 7
+    if (test .ne. "test") STOP 8
   end function test2
 end program tester