diff options
author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-02-23 22:36:54 +0000 |
---|---|---|
committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-02-23 22:36:54 +0000 |
commit | 88a3ea34080ad3087a8191fbf479543153175d59 (patch) | |
tree | 34eaec34d3588e09f9a77abba776266f124dc823 /gcc/testsuite/gfortran.dg/merge_init_expr.f90 | |
parent | 25e15aaed275cdfef34b3ee6eb3cb4b43a48d44f (diff) | |
parent | e65055a558093bd4fc0b1b0024b7814cc187b8e8 (diff) | |
download | gccgo.tar.gz |
Merge from trunk revision 257954.gccgo
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gccgo@257955 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/testsuite/gfortran.dg/merge_init_expr.f90')
-rw-r--r-- | gcc/testsuite/gfortran.dg/merge_init_expr.f90 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gcc/testsuite/gfortran.dg/merge_init_expr.f90 b/gcc/testsuite/gfortran.dg/merge_init_expr.f90 index c691aa0e325..188d3cd6aea 100644 --- a/gcc/testsuite/gfortran.dg/merge_init_expr.f90 +++ b/gcc/testsuite/gfortran.dg/merge_init_expr.f90 @@ -18,11 +18,11 @@ INTEGER, PARAMETER :: array_7(3) = MERGE ([1,2,3], -array, mask) - IF (scalar_1 /= 1 .OR. scalar_2 /= 1) CALL abort - IF (.NOT. ALL (array_1 == array)) CALL abort - IF (.NOT. ALL (array_2 == [0, 0, 0])) CALL abort - IF (.NOT. ALL (array_3 == [0, 0, 0])) CALL abort - IF (.NOT. ALL (array_4 == array)) CALL abort - IF (.NOT. ALL (array_5 == [1, 0, 1])) CALL abort - IF (.NOT. ALL (array_6 == [1, -2, 3])) CALL abort + IF (scalar_1 /= 1 .OR. scalar_2 /= 1) STOP 1 + IF (.NOT. ALL (array_1 == array)) STOP 2 + IF (.NOT. ALL (array_2 == [0, 0, 0])) STOP 3 + IF (.NOT. ALL (array_3 == [0, 0, 0])) STOP 4 + IF (.NOT. ALL (array_4 == array)) STOP 5 + IF (.NOT. ALL (array_5 == [1, 0, 1])) STOP 6 + IF (.NOT. ALL (array_6 == [1, -2, 3])) STOP 7 END |