testsuite oddities

[Manfred Schwarb <manfred99 at gmx dot ch>]

Hi,

I did some tests for unbalanced curly braces in the gfortran testsuite
and got quite some output, see attached patch.

additionally,
- corrected "dg-do  run" issues (double space)
- dg-flags should be dg-options
- string adjustments needed after fixing curly braces

old summary:
# of expected passes		44390
# of expected failures		52
# of unsupported tests		79

new summary:
# of expected passes            44498
# of expected failures          52
# of unsupported tests          79

could someone please check and commit?

Cheers,
Manfred

Index: coarray_poly_3.f90
===================================================================
--- coarray_poly_3.f90	(revision 199605)
+++ coarray_poly_3.f90	(working copy)
@@ -25,7 +25,7 @@
 function func() ! { dg-error "shall not be a coarray or have a coarray component" }
   type t
   end type t
-  class(t), allocatable :: func[*] ! { dg-error ""
+  class(t), allocatable :: func[*]
 end
 
 function func2() ! { dg-error "must be dummy, allocatable or pointer" }
@@ -33,7 +33,7 @@
     integer, allocatable :: caf[:]
   end type t
   class(t) :: func2a ! { dg-error "CLASS variable 'func2a' at .1. must be dummy, allocatable or pointer" }
-  class(t) :: func2 ! {CLASS variable 'func' at (1) must be dummy, allocatable or pointer
+  class(t) :: func2
 end
 
 subroutine foo1(x1) ! { dg-error "Coarray variable 'x1' at .1. shall not have codimensions with deferred shape" }
Index: transpose_2.f90
===================================================================
--- transpose_2.f90	(revision 199605)
+++ transpose_2.f90	(working copy)
@@ -15,5 +15,4 @@
   b = 2.1
   b = transpose(a)
 end program main
-! { dg-output "Fortran runtime error: Array bound mismatch for dimension 1 of
-! array 'b' (3/2)" }
+! { dg-output "Fortran runtime error: Array bound mismatch for dimension 1 of array 'b' \\(3/2\\)" }
Index: repeat_1.f90
===================================================================
--- repeat_1.f90	(revision 199605)
+++ repeat_1.f90	(working copy)
@@ -17,4 +17,4 @@
     f = x
   end function f
 end
-! { dg-output "Fortran runtime error: Argument NCOPIES of REPEAT intrinsic is negative .* line 6)"
+! { dg-output "Fortran runtime error: Argument NCOPIES of REPEAT intrinsic is negative \\(its value is -1\\)" }
Index: io_real_boz_3.f90
===================================================================
--- io_real_boz_3.f90	(revision 199605)
+++ io_real_boz_3.f90	(working copy)
@@ -1,4 +1,4 @@
-! { dg-do  run }
+! { dg-do run }
 ! { dg-options "-std=f2008" }
 ! { dg-require-effective-target fortran_real_16 }
 !
Index: io_real_boz_5.f90
===================================================================
--- io_real_boz_5.f90	(revision 199605)
+++ io_real_boz_5.f90	(working copy)
@@ -1,4 +1,4 @@
-! { dg-do  run }
+! { dg-do run }
 ! { dg-options "-std=f2008" }
 ! { dg-require-effective-target fortran_real_16 }
 !
Index: default_initialization_5.f90
===================================================================
--- default_initialization_5.f90	(revision 199605)
+++ default_initialization_5.f90	(working copy)
@@ -1,4 +1,4 @@
-! { dg-do  run }
+! { dg-do run }
 ! { dg-options "-fdump-tree-original" }
 !
 ! PR fortran/51435
Index: namelist_print_1.f
===================================================================
--- namelist_print_1.f	(revision 199605)
+++ namelist_print_1.f	(working copy)
@@ -8,6 +8,6 @@
       real  x
       namelist /mynml/ x
       x = 1
-! ( dg-output "^" }
+! { dg-output "^" }
       print mynml ! { dg-output "&MYNML(\n|\r\n|\r) X=  1.00000000    ,(\n|\r\n|\r) /(\n|\r\n|\r)" }
       end
Index: spread_bounds_1.f90
===================================================================
--- spread_bounds_1.f90	(revision 199605)
+++ spread_bounds_1.f90	(working copy)
@@ -8,5 +8,5 @@
   times = 2
   target = spread(source,2,times)
 end program main
-! { dg-output "Fortran runtime error:  Incorrect extent in return value of SPREAD intrinsic in dimension 2: is 3, should be 2"
+! { dg-output "Fortran runtime error: Incorrect extent in return value of SPREAD intrinsic in dimension 2: is 3, should be 2" }
 
Index: init_flag_11.f90
===================================================================
--- init_flag_11.f90	(revision 199605)
+++ init_flag_11.f90	(working copy)
@@ -1,5 +1,5 @@
 ! { dg-do compile }
-! { dg-flags "-finit-local-zero -fno-automatic"
+! { dg-options "-finit-local-zero -fno-automatic" }
 !
 ! PR fortran/53818
 !
Index: bounds_check_7.f90
===================================================================
--- bounds_check_7.f90	(revision 199605)
+++ bounds_check_7.f90	(working copy)
@@ -5,7 +5,7 @@
 subroutine foo(a)
   integer a(*), i
   i = 0
-  a(i) = 42 ! {
+  a(i) = 42
 end subroutine foo
 
 program test
Index: io_real_boz_4.f90
===================================================================
--- io_real_boz_4.f90	(revision 199605)
+++ io_real_boz_4.f90	(working copy)
@@ -1,4 +1,4 @@
-! { dg-do  run }
+! { dg-do run }
 ! { dg-options "-std=f2003" }
 ! { dg-require-effective-target fortran_real_16 }
 !
Index: g77/f77-edit-t-out.f
===================================================================
--- g77/f77-edit-t-out.f	(revision 199605)
+++ g77/f77-edit-t-out.f	(working copy)
@@ -4,9 +4,9 @@
 C Origin: David Billinghurst <David.Billinghurst@riotinto.com>
 C
 C { dg-do run }
-C ( dg-output "^" }
+C { dg-output "^" }
       write(*,'(I4,T8,I1)')     1234,8 ! { dg-output "1234   8(\n|\r\n|\r)" }
       write(*,'(I4,TR3,I1)')    1234,8 ! { dg-output "1234   8(\n|\r\n|\r)" }
       write(*,'(I4,5X,TL2,I1)') 1234,8 ! { dg-output "1234   8(\n|\r\n|\r)" }
-C ( dg-output "\$" }
+C { dg-output "\$" }
       end
Index: g77/f77-edit-x-out.f
===================================================================
--- g77/f77-edit-x-out.f	(revision 199605)
+++ g77/f77-edit-x-out.f	(working copy)
@@ -4,7 +4,7 @@
 C Origin: David Billinghurst <David.Billinghurst@riotinto.com>
 C
 C { dg-do run } 
-C ( dg-output "^" }
+C { dg-output "^" }
       write(*,'(I1,1X,I1,2X,I1)') 1,2,3    ! { dg-output "1 2  3(\n|\r\n|\r)" }
 C Section 13.5.3 explains why there are no trailing blanks
       write(*,'(I1,1X,I1,2X,I1,3X)') 1,2,3 ! { dg-output "1 2  3(\n|\r\n|\r)" }
Index: g77/f77-edit-s-out.f
===================================================================
--- g77/f77-edit-s-out.f	(revision 199605)
+++ g77/f77-edit-s-out.f	(working copy)
@@ -4,7 +4,7 @@
 C Origin: David Billinghurst <David.Billinghurst@riotinto.com>
 C
 C { dg-do run }
-C ( dg-output "^" }
+C { dg-output "^" }
  10   format(SP,I3,1X,SS,I3)
  20   format(SP,I3,1X,SS,I3,SP,I3)
  30   format(SP,I3,1X,SS,I3,S,I3)
Index: read_x_eor.f90
===================================================================
--- read_x_eor.f90	(revision 199605)
+++ read_x_eor.f90	(working copy)
@@ -1,5 +1,5 @@
 ! { dg-do run }
-! ( dg-output "^" }
+! { dg-output "^" }
 !
 ! Test fix for pr24785 - EOR used to scrub the 2X.
 ! Reduced from PR example submitted by Harald Anlauf <anlauf@gmx.de>