aboutsummaryrefslogtreecommitdiff
path: root/gcc/testsuite
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/testsuite')
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/merge_char_1.f907
2 files changed, 12 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ba2a713..da0463c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2004-09-01 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de>
+ PR fortran/15327
+ * gfortran.dg/merge_char_1.f90: New test.
+
+2004-09-01 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de>
+
PR fortran/16404
* gfortran.dg/der_io_1.f90: XFAIL illegal testcase.
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 0000000..0a8036d
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/merge_char_1.f90
@@ -0,0 +1,7 @@
+! { dg-do run }
+! 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