diff options
-rw-r--r-- | gcc/testsuite/ChangeLog | 18 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/bounds_check_7.f90 | 2 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/coarray_poly_3.f90 | 4 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/default_initialization_5.f90 | 2 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/g77/f77-edit-s-out.f | 2 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/g77/f77-edit-t-out.f | 4 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/g77/f77-edit-x-out.f | 2 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/init_flag_11.f90 | 2 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/io_real_boz_3.f90 | 1 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/io_real_boz_4.f90 | 1 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/io_real_boz_5.f90 | 1 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/namelist_print_1.f | 2 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/read_x_eor.f90 | 2 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/repeat_1.f90 | 2 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/spread_bounds_1.f90 | 2 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/transpose_2.f90 | 3 |
16 files changed, 35 insertions, 15 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e0f75fd..27b2670 100644 --- 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 c488a68..b384199 100644 --- 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 8edd8d3..fd46206 100644 --- 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 b32dae7..50860e0 100644 --- 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 89a8df2..7a22ae6 100644 --- 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 8e41188..b47b747 100644 --- 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 9d19633..13a9d7a 100644 --- 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 7a5239f..d881c2c 100644 --- 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 8043167..b8bc9a1 100644 --- 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 f2c2aca..2de0be7 100644 --- 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 db8e6e7..2cdfeee 100644 --- 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 2e5de83..d97d1c9 100644 --- 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 064835a..a06e6df 100644 --- 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 7a1d6f9..1ac105c 100644 --- 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 7e5bc65..53e08b1 100644 --- 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 4ab3bc4..e509d36 100644 --- 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\\)" } |