bounds_check_7.f90: Remove "!

2013-06-03  Manfred Schwarb  <manfred99@gmx.ch>

        * gfortran.dg/bounds_check_7.f90: Remove "! {".
        * gfortran.dg/coarray_poly_3.f90: Remove inactive, broken dg-*.
        * gfortran.dg/default_initialization_5.f90: Update dg-do.
        * gfortran.dg/g77/f77-edit-s-out.f: Fix broken dg-output.
        * gfortran.dg/g77/f77-edit-t-out.f: Fix broken dg-output.
        * gfortran.dg/g77/f77-edit-x-out.f: Fix broken dg-output.
        * gfortran.dg/init_flag_11.f90: Fix broken dg-options.
        * gfortran.dg/io_real_boz_3.f90: Add comment regarding dg-do run.
        * gfortran.dg/io_real_boz_4.f90: Ditto.
        * gfortran.dg/io_real_boz_5.f90: Ditto.
        * gfortran.dg/namelist_print_1.f: Fix broken dg-output.
        * gfortran.dg/read_x_eor.f90: Fix broken dg-output.
        * gfortran.dg/repeat_1.f90: Improve dg-output pattern.
        * gfortran.dg/spread_bounds_1.f90: Fix broken dg-output.
        * gfortran.dg/transpose_2.f90: Fix dg-output.

From-SVN: r199636

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e0f75fdc0a245feaab90da43e753b62e5c83201d..27b2670f6620546060ca211ef5f1dd618709f85d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,21 @@
+2013-06-03  Manfred Schwarb  <manfred99@gmx.ch>
+
+       * gfortran.dg/bounds_check_7.f90: Remove "! {".
+       * gfortran.dg/coarray_poly_3.f90: Remove inactive, broken dg-*.
+       * gfortran.dg/default_initialization_5.f90: Update dg-do.
+       * gfortran.dg/g77/f77-edit-s-out.f: Fix broken dg-output.
+       * gfortran.dg/g77/f77-edit-t-out.f: Fix broken dg-output.
+       * gfortran.dg/g77/f77-edit-x-out.f: Fix broken dg-output.
+       * gfortran.dg/init_flag_11.f90: Fix broken dg-options.
+       * gfortran.dg/io_real_boz_3.f90: Add comment regarding dg-do  run.
+       * gfortran.dg/io_real_boz_4.f90: Ditto.
+       * gfortran.dg/io_real_boz_5.f90: Ditto.
+       * gfortran.dg/namelist_print_1.f: Fix broken dg-output.
+       * gfortran.dg/read_x_eor.f90: Fix broken dg-output.
+       * gfortran.dg/repeat_1.f90: Improve dg-output pattern.
+       * gfortran.dg/spread_bounds_1.f90: Fix broken dg-output.
+       * gfortran.dg/transpose_2.f90: Fix dg-output.
+
 2013-06-03  Balaji V. Iyer  <balaji.v.iyer@intel.com>
 
        * c-c++-common/cilk-plus/AN/if_test_errors.c (main): New testcase.

diff --git a/gcc/testsuite/gfortran.dg/bounds_check_7.f90 b/gcc/testsuite/gfortran.dg/bounds_check_7.f90
index c488a68cadc6f3ff3634453e6ccef2983c22b870..b38419908bbd429e77854788e33ac78d93794b32 100644 (file)
--- a/gcc/testsuite/gfortran.dg/bounds_check_7.f90
+++ b/gcc/testsuite/gfortran.dg/bounds_check_7.f90
@@ -5,7 +5,7 @@
 subroutine foo(a)
   integer a(*), i
   i = 0
-  a(i) = 42 ! {
+  a(i) = 42
 end subroutine foo
 
 program test

diff --git a/gcc/testsuite/gfortran.dg/coarray_poly_3.f90 b/gcc/testsuite/gfortran.dg/coarray_poly_3.f90
index 8edd8d3c63e90f467aaf630fd574e0f840c77577..fd46206ea15273ceeedf19a6a61ff8a42819fb1e 100644 (file)
--- a/gcc/testsuite/gfortran.dg/coarray_poly_3.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_poly_3.f90
@@ -25,7 +25,7 @@ end
 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 @@ function func2() ! { dg-error "must be dummy, allocatable or pointer" }
     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" }

diff --git a/gcc/testsuite/gfortran.dg/default_initialization_5.f90 b/gcc/testsuite/gfortran.dg/default_initialization_5.f90
index b32dae7c6cb03c6114230553aea9b487e2fc9f1f..50860e0d064de79ef99b6e287c75e09dc9fab431 100644 (file)
--- a/gcc/testsuite/gfortran.dg/default_initialization_5.f90
+++ b/gcc/testsuite/gfortran.dg/default_initialization_5.f90
@@ -1,4 +1,4 @@
-! { dg-do  run }
+! { dg-do run }
 ! { dg-options "-fdump-tree-original" }
 !
 ! PR fortran/51435

diff --git a/gcc/testsuite/gfortran.dg/g77/f77-edit-s-out.f b/gcc/testsuite/gfortran.dg/g77/f77-edit-s-out.f
index 89a8df2caffd313a1f4ef8cdb1ebc568e23a4a04..7a22ae6b8143fb89f0fe662e36bd0465181a4a0c 100644 (file)
--- a/gcc/testsuite/gfortran.dg/g77/f77-edit-s-out.f
+++ b/gcc/testsuite/gfortran.dg/g77/f77-edit-s-out.f
@@ -4,7 +4,7 @@ C
 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)

diff --git a/gcc/testsuite/gfortran.dg/g77/f77-edit-t-out.f b/gcc/testsuite/gfortran.dg/g77/f77-edit-t-out.f
index 8e411888f2b04cd9f0ff96fc3b57736d16b89abc..b47b7477603d0f8d866daf4c05db94ddd15e810d 100644 (file)
--- a/gcc/testsuite/gfortran.dg/g77/f77-edit-t-out.f
+++ b/gcc/testsuite/gfortran.dg/g77/f77-edit-t-out.f
@@ -4,9 +4,9 @@ C
 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

diff --git a/gcc/testsuite/gfortran.dg/g77/f77-edit-x-out.f b/gcc/testsuite/gfortran.dg/g77/f77-edit-x-out.f
index 9d196331dd16901abb507b8b634067e6639e1241..13a9d7a93e8116ae679f8019135fc3c878a8ddd7 100644 (file)
--- a/gcc/testsuite/gfortran.dg/g77/f77-edit-x-out.f
+++ b/gcc/testsuite/gfortran.dg/g77/f77-edit-x-out.f
@@ -4,7 +4,7 @@ C
 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)" }

diff --git a/gcc/testsuite/gfortran.dg/init_flag_11.f90 b/gcc/testsuite/gfortran.dg/init_flag_11.f90
index 7a5239fc457d82e06b2544c9283c1960bda9b59b..d881c2c9ce841ebe78caad6a0db87411d78862c0 100644 (file)
--- a/gcc/testsuite/gfortran.dg/init_flag_11.f90
+++ b/gcc/testsuite/gfortran.dg/init_flag_11.f90
@@ -1,5 +1,5 @@
 ! { dg-do compile }
-! { dg-flags "-finit-local-zero -fno-automatic"
+! { dg-options "-finit-local-zero -fno-automatic" }
 !
 ! PR fortran/53818
 !

diff --git a/gcc/testsuite/gfortran.dg/io_real_boz_3.f90 b/gcc/testsuite/gfortran.dg/io_real_boz_3.f90
index 8043167cd7f6ba6bdb4217dac9dbbe3bd1a95ee3..b8bc9a194b99504665ad542d80a429a1a1b230f8 100644 (file)
--- a/gcc/testsuite/gfortran.dg/io_real_boz_3.f90
+++ b/gcc/testsuite/gfortran.dg/io_real_boz_3.f90
@@ -1,4 +1,5 @@
 ! { dg-do  run }
+! Note: two spaces before "run" to run only once (libgfortran test)
 ! { dg-options "-std=f2008" }
 ! { dg-require-effective-target fortran_real_16 }
 !

diff --git a/gcc/testsuite/gfortran.dg/io_real_boz_4.f90 b/gcc/testsuite/gfortran.dg/io_real_boz_4.f90
index f2c2aca4bd681e70f44b261353baab2d42b6fbbb..2de0be73fa9875c127264f6ee22b78012db34daf 100644 (file)
--- a/gcc/testsuite/gfortran.dg/io_real_boz_4.f90
+++ b/gcc/testsuite/gfortran.dg/io_real_boz_4.f90
@@ -1,4 +1,5 @@
 ! { dg-do  run }
+! Note: two spaces before "run" to run only once (libgfortran test)
 ! { dg-options "-std=f2003" }
 ! { dg-require-effective-target fortran_real_16 }
 !

diff --git a/gcc/testsuite/gfortran.dg/io_real_boz_5.f90 b/gcc/testsuite/gfortran.dg/io_real_boz_5.f90
index db8e6e7557c846de42ecaf4457266751a1413076..2cdfeeed7fd4015930f344d2f324c420db2a535c 100644 (file)
--- a/gcc/testsuite/gfortran.dg/io_real_boz_5.f90
+++ b/gcc/testsuite/gfortran.dg/io_real_boz_5.f90
@@ -1,4 +1,5 @@
 ! { dg-do  run }
+! Note: two spaces before "run" to run only once (libgfortran test)
 ! { dg-options "-std=f2008" }
 ! { dg-require-effective-target fortran_real_16 }
 !

diff --git a/gcc/testsuite/gfortran.dg/namelist_print_1.f b/gcc/testsuite/gfortran.dg/namelist_print_1.f
index 2e5de8305b8c91c244f7adf24602f9b1a67644f8..d97d1c9e9a44f08ce05ae9ca3a07cddb4a4393a8 100644 (file)
--- a/gcc/testsuite/gfortran.dg/namelist_print_1.f
+++ b/gcc/testsuite/gfortran.dg/namelist_print_1.f
@@ -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

diff --git a/gcc/testsuite/gfortran.dg/read_x_eor.f90 b/gcc/testsuite/gfortran.dg/read_x_eor.f90
index 064835a8b2879bf848e117c8548d1c0f94542e25..a06e6df14533a261790e0fd9387b2ee5b682d331 100644 (file)
--- a/gcc/testsuite/gfortran.dg/read_x_eor.f90
+++ b/gcc/testsuite/gfortran.dg/read_x_eor.f90
@@ -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>

diff --git a/gcc/testsuite/gfortran.dg/repeat_1.f90 b/gcc/testsuite/gfortran.dg/repeat_1.f90
index 7a1d6f9294c5486f3169099e0aa1df75ba550589..1ac105c2e3cd6cfecbdc3ec0ae07339c5e436df9 100644 (file)
--- a/gcc/testsuite/gfortran.dg/repeat_1.f90
+++ b/gcc/testsuite/gfortran.dg/repeat_1.f90
@@ -17,4 +17,4 @@ contains
     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\\)" }

diff --git a/gcc/testsuite/gfortran.dg/spread_bounds_1.f90 b/gcc/testsuite/gfortran.dg/spread_bounds_1.f90
index 7e5bc651ff5fb8f045ca901b3ec918152f1ee3d8..53e08b1c657516ee11cc80f23d1c77d50885e6b6 100644 (file)
--- a/gcc/testsuite/gfortran.dg/spread_bounds_1.f90
+++ b/gcc/testsuite/gfortran.dg/spread_bounds_1.f90
@@ -8,5 +8,5 @@ program main
   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" }
 

diff --git a/gcc/testsuite/gfortran.dg/transpose_2.f90 b/gcc/testsuite/gfortran.dg/transpose_2.f90
index 4ab3bc4bb1a8ce9e643dea60a3dda09e0afb450b..e509d3686bd0e42e21c1f79a33a4ca6df6da0422 100644 (file)
--- a/gcc/testsuite/gfortran.dg/transpose_2.f90
+++ b/gcc/testsuite/gfortran.dg/transpose_2.f90
@@ -15,5 +15,4 @@ program main
   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\\)" }