pr32627.f03 (strptr): Change size to match the number of non-nul characters.

	* gfortran.dg/pr32627.f03 (strptr): Change size to match the number
	of non-nul characters.
	* gfortran.dg/substr_6.f90: Make the NUL character visible on stdout

From-SVN: r222214

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ee4f05f685371cc2fd11bdb6b02f96480394ad48..b4052efcb979bd4f1d67262f895940ce29e40797 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-18  Martin Sebor  <msebor@redhat.com>
+
+       * gfortran.dg/pr32627.f03 (strptr): Change size to match the number
+       of non-nul characters.
+       * gfortran.dg/substr_6.f90: Make the NUL character visible on stdout
+
 2015-04-17  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
        PR target/65787

diff --git a/gcc/testsuite/gfortran.dg/pr32627.f03 b/gcc/testsuite/gfortran.dg/pr32627.f03
index f8695e00642d2d09eb59d61bc7f2a82de60c0931..d9e2b138506e6bc9235d44e5c17b149bea1314f1 100644 (file)
--- a/gcc/testsuite/gfortran.dg/pr32627.f03
+++ b/gcc/testsuite/gfortran.dg/pr32627.f03
@@ -18,7 +18,7 @@ program main
   type( c_ptr )               :: x
   type( A ), pointer          :: fptr
   type( A ), target           :: my_a_type
-  character( len=9 ), pointer :: strptr
+  character( len=8 ), pointer :: strptr
 
   fptr => my_a_type
 

diff --git a/gcc/testsuite/gfortran.dg/substr_6.f90 b/gcc/testsuite/gfortran.dg/substr_6.f90
index 813a02521a34dbad6fb7c7eb89e932d51d7c92da..a7cdc100ee634c1fb42c5dad4dc33ea379c61d6c 100644 (file)
--- a/gcc/testsuite/gfortran.dg/substr_6.f90
+++ b/gcc/testsuite/gfortran.dg/substr_6.f90
@@ -11,6 +11,15 @@ if (c(1) /= "     ") call abort()
 c = (/ c0(1)(1:5) /)
 do i=1,5
    if (c(1)(i:i) /= c1(i)) call abort()
+
+   ! Make NULs visible (and avoid corrupting text output).
+   if (c(1)(i:i) == ACHAR(0)) then
+    print "(a,$)", "<NUL>"
+  else
+    print "(a,$)", c(1)(i:i)
+  end if
 end do
-print *, c(1)
+
+print *, ""
+
 end