From 554fd8c5195424bdbcabf5de30fdc183aba391bd Mon Sep 17 00:00:00 2001 From: upstream source tree Date: Sun, 15 Mar 2015 20:14:05 -0400 Subject: obtained gcc-4.6.4.tar.bz2 from upstream website; verified gcc-4.6.4.tar.bz2.sig; imported gcc-4.6.4 source tree from verified upstream tarball. downloading a git-generated archive based on the 'upstream' tag should provide you with a source tree that is binary identical to the one extracted from the above tarball. if you have obtained the source via the command 'git clone', however, do note that line-endings of files in your working directory might differ from line-endings of the respective files in the upstream repository. --- gcc/testsuite/gfortran.dg/merge_char_1.f90 | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/merge_char_1.f90 (limited to 'gcc/testsuite/gfortran.dg/merge_char_1.f90') diff --git a/gcc/testsuite/gfortran.dg/merge_char_1.f90 b/gcc/testsuite/gfortran.dg/merge_char_1.f90 new file mode 100644 index 000000000..5974e8c06 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/merge_char_1.f90 @@ -0,0 +1,9 @@ +! { dg-do run } +! { dg-options "-std=legacy" } +! +! PR 15327 +! The merge intrinsic didn't work for strings +character*2 :: c(2) +c = merge( (/ "AA", "BB" /), (/ "CC", "DD" /), (/ .TRUE., .FALSE. /) ) +if (c(1).ne."AA" .or. c(2).ne."DD") call abort () +end -- cgit v1.2.3