From 4d8516587ac4490634b02e647d04db511660bbcb Mon Sep 17 00:00:00 2001
From: Manfred Schwarb <manfred99@gmx.ch>
Date: Mon, 21 Jan 2019 22:40:21 +0100
Subject: [PATCH] class_66.f90: Fix a dg directive.

2019-01-21  Manfred Schwarb  <manfred99@gmx.ch>

	* class_66.f90: Fix a dg directive.
	* debug/pr35154-stabs.f: Likewise.
	* dec_d_lines_3.f: Likewise.
	* dec_d_lines_3.f: Likewise.
	* dec_structure_12.f90: Likewise.
	* dec_structure_15.f90: Likewise.
	* deferred_character_31.f90: Likewise.
	* dtio_31.f03: Likewise.
	* dtio_32.f03: Likewise.
	* extends_11.f03: Likewise.
	* integer_plus.f90: Likewise.
	* pdt_25.f03: Likewise.
	* pr58968.f: Likewise.
	* pr78259.f90: Likewise.
	* vect/vect-2.f90: Likewise.
	* matmul_const.f90: Likewise.

From-SVN: r268125
---
 gcc/testsuite/ChangeLog                       | 19 +++++++++++++++++++
 gcc/testsuite/gfortran.dg/class_66.f90        |  2 +-
 .../gfortran.dg/debug/pr35154-stabs.f         |  2 +-
 gcc/testsuite/gfortran.dg/dec_d_lines_3.f     |  4 ++--
 .../gfortran.dg/dec_structure_12.f90          |  2 +-
 .../gfortran.dg/dec_structure_15.f90          |  2 +-
 .../gfortran.dg/deferred_character_31.f90     |  2 +-
 gcc/testsuite/gfortran.dg/dtio_31.f03         |  2 +-
 gcc/testsuite/gfortran.dg/dtio_32.f03         |  2 +-
 gcc/testsuite/gfortran.dg/extends_11.f03      |  2 +-
 gcc/testsuite/gfortran.dg/integer_plus.f90    |  2 +-
 gcc/testsuite/gfortran.dg/matmul_const.f90    |  2 +-
 gcc/testsuite/gfortran.dg/pdt_25.f03          |  2 +-
 gcc/testsuite/gfortran.dg/pr58968.f           |  2 +-
 gcc/testsuite/gfortran.dg/pr78259.f90         |  2 +-
 gcc/testsuite/gfortran.dg/vect/vect-2.f90     |  2 +-
 16 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bb703a1b86a..96f652746fb 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,22 @@
+2019-01-21  Manfred Schwarbi  <manfred99@gmx.ch>
+
+	* class_66.f90: Fix a dg directive.
+	* debug/pr35154-stabs.f: Likewise.
+	* dec_d_lines_3.f: Likewise.
+	* dec_d_lines_3.f: Likewise.
+	* dec_structure_12.f90: Likewise.
+	* dec_structure_15.f90: Likewise.
+	* deferred_character_31.f90: Likewise.
+	* dtio_31.f03: Likewise.
+	* dtio_32.f03: Likewise.
+	* extends_11.f03: Likewise.
+	* integer_plus.f90: Likewise.
+	* pdt_25.f03: Likewise.
+	* pr58968.f: Likewise.
+	* pr78259.f90: Likewise.
+	* vect/vect-2.f90: Likewise.
+	* matmul_const.f90: Likewise.
+
 2019-01-21  Uroš Bizjak  <ubizjak@gmail.com>
 
 	PR target/88938
diff --git a/gcc/testsuite/gfortran.dg/class_66.f90 b/gcc/testsuite/gfortran.dg/class_66.f90
index 475b7b26555..8ca269b83b1 100644
--- a/gcc/testsuite/gfortran.dg/class_66.f90
+++ b/gcc/testsuite/gfortran.dg/class_66.f90
@@ -1,4 +1,4 @@
-! { dg- do run }
+! { dg-do run }
 !
 ! Test the fix for PR78641 in which an ICE occured on assignment
 ! of a class array constructor to a derived type array.
diff --git a/gcc/testsuite/gfortran.dg/debug/pr35154-stabs.f b/gcc/testsuite/gfortran.dg/debug/pr35154-stabs.f
index 99f3e2b7a11..5e5c42e9b8f 100644
--- a/gcc/testsuite/gfortran.dg/debug/pr35154-stabs.f
+++ b/gcc/testsuite/gfortran.dg/debug/pr35154-stabs.f
@@ -1,7 +1,7 @@
 C     Test program for common block debugging.  G. Helffrich 11 July 2004.
 C { dg-do compile }
 C { dg-skip-if "No stabs" { aarch64*-*-* mmix-*-* alpha*-*-* hppa*64*-*-* ia64-*-* *-*-vxworks* } }
-C { dg-skip-if "No stabs" {*-*-* } { "*" } { "-gstabs" } }
+C { dg-skip-if "No stabs" { *-*-* } { "*" } { "-gstabs" } }
       common i,j
       common /label/l,m
       i = 1
diff --git a/gcc/testsuite/gfortran.dg/dec_d_lines_3.f b/gcc/testsuite/gfortran.dg/dec_d_lines_3.f
index 1e96d750dfb..11e16d3025b 100644
--- a/gcc/testsuite/gfortran.dg/dec_d_lines_3.f
+++ b/gcc/testsuite/gfortran.dg/dec_d_lines_3.f
@@ -8,5 +8,5 @@
 
 include 'dec_d_lines_2.f'
 
-! { dg-error "character in statement label" " " { target *-*-*} 6 }
-! { dg-error "character in statement label" " " { target *-*-*} 7 }
+! { dg-error "character in statement label" " " { target *-*-* } 6 }
+! { dg-error "character in statement label" " " { target *-*-* } 7 }
diff --git a/gcc/testsuite/gfortran.dg/dec_structure_12.f90 b/gcc/testsuite/gfortran.dg/dec_structure_12.f90
index b6cc5aa12ed..720d6ddc5d0 100644
--- a/gcc/testsuite/gfortran.dg/dec_structure_12.f90
+++ b/gcc/testsuite/gfortran.dg/dec_structure_12.f90
@@ -1,4 +1,4 @@
-! { dg-do "compile" }
+! { dg-do compile }
 ! { dg-options "-fdec-structure" }
 !
 ! Test a regression where multiple anonymous structures failed to
diff --git a/gcc/testsuite/gfortran.dg/dec_structure_15.f90 b/gcc/testsuite/gfortran.dg/dec_structure_15.f90
index 33f51266c0f..a61cc9d85b1 100644
--- a/gcc/testsuite/gfortran.dg/dec_structure_15.f90
+++ b/gcc/testsuite/gfortran.dg/dec_structure_15.f90
@@ -1,4 +1,4 @@
-! { dg-do "compile" }
+! { dg-do compile }
 ! { dg-options "" }
 !
 ! PR fortran/77584
diff --git a/gcc/testsuite/gfortran.dg/deferred_character_31.f90 b/gcc/testsuite/gfortran.dg/deferred_character_31.f90
index 890b33e82df..db1abd3df84 100644
--- a/gcc/testsuite/gfortran.dg/deferred_character_31.f90
+++ b/gcc/testsuite/gfortran.dg/deferred_character_31.f90
@@ -1,4 +1,4 @@
-! { dg-do }
+! { dg-do run }
 !
 ! Test the fix for PR71880 in which the string length for 'p'
 ! was not set for the pointer assignment.
diff --git a/gcc/testsuite/gfortran.dg/dtio_31.f03 b/gcc/testsuite/gfortran.dg/dtio_31.f03
index 9d622a21b5a..2a8fa1ead77 100644
--- a/gcc/testsuite/gfortran.dg/dtio_31.f03
+++ b/gcc/testsuite/gfortran.dg/dtio_31.f03
@@ -1,5 +1,5 @@
 ! { dg-do run }
-! { dg-options="-w" }
+! { dg-options "-w" }
 ! PR fortran/79383
 ! Contributed by Walt Brainerd <walt.brainerd at gmail dot com>
 module dollar_mod
diff --git a/gcc/testsuite/gfortran.dg/dtio_32.f03 b/gcc/testsuite/gfortran.dg/dtio_32.f03
index 254a47eb94d..4bad640ae80 100644
--- a/gcc/testsuite/gfortran.dg/dtio_32.f03
+++ b/gcc/testsuite/gfortran.dg/dtio_32.f03
@@ -1,5 +1,5 @@
 ! { dg-do run }
-! { dg-options="-w" }
+! { dg-options "-w" }
 ! PR fortran/79383
 ! Contributed by Walt Brainerd <walt.brainerd at gmail dot com>
 module dollar_mod
diff --git a/gcc/testsuite/gfortran.dg/extends_11.f03 b/gcc/testsuite/gfortran.dg/extends_11.f03
index 7b32cdf547f..2f19225d703 100644
--- a/gcc/testsuite/gfortran.dg/extends_11.f03
+++ b/gcc/testsuite/gfortran.dg/extends_11.f03
@@ -37,4 +37,4 @@
   recruit%service%education%person%ss = 9
 end
 
-! { dg-final { scan-tree-dump-times " +recruit\\.service\\.education\\.person\\.ss =" 8 "original"} }
+! { dg-final { scan-tree-dump-times " +recruit\\.service\\.education\\.person\\.ss =" 8 "original" } }
diff --git a/gcc/testsuite/gfortran.dg/integer_plus.f90 b/gcc/testsuite/gfortran.dg/integer_plus.f90
index 64c4b1c9853..242835be8d0 100644
--- a/gcc/testsuite/gfortran.dg/integer_plus.f90
+++ b/gcc/testsuite/gfortran.dg/integer_plus.f90
@@ -1,4 +1,4 @@
-! { dg-run run )
+! { dg-do run }
 ! PR83560 list-directed formatting of INTEGER is missing plus on output
 ! when output open with SIGN='PLUS'
 character(64) :: astring
diff --git a/gcc/testsuite/gfortran.dg/matmul_const.f90 b/gcc/testsuite/gfortran.dg/matmul_const.f90
index 11cc31ab26a..ab186fdd883 100644
--- a/gcc/testsuite/gfortran.dg/matmul_const.f90
+++ b/gcc/testsuite/gfortran.dg/matmul_const.f90
@@ -7,4 +7,4 @@ program main
   write (unit=line,fmt='(9i3)') matmul(A,B)
   if (line /= '  5  7  9  5  7  9  5  7  9') STOP 1
 end program main
-!  dg-final { scan-tree-dump-times "matmul_i4" 0 "original" } }
+! { dg-final { scan-tree-dump-times "matmul_i4" 0 "original" } }
diff --git a/gcc/testsuite/gfortran.dg/pdt_25.f03 b/gcc/testsuite/gfortran.dg/pdt_25.f03
index f233996129e..548eb193a52 100644
--- a/gcc/testsuite/gfortran.dg/pdt_25.f03
+++ b/gcc/testsuite/gfortran.dg/pdt_25.f03
@@ -1,4 +1,4 @@
-! {dg-do run }
+! { dg-do run }
 !
 ! Tests the fix for PR82978 in which all the parameterized string
 ! lengths with the same value of parameter 'k' had the same value
diff --git a/gcc/testsuite/gfortran.dg/pr58968.f b/gcc/testsuite/gfortran.dg/pr58968.f
index db06d50fa27..b6ea17f4ae2 100644
--- a/gcc/testsuite/gfortran.dg/pr58968.f
+++ b/gcc/testsuite/gfortran.dg/pr58968.f
@@ -1,5 +1,5 @@
 C PR rtl-optimization/58968.f
-C { dg-do compile { target powerpc*-*-*} }
+C { dg-do compile { target powerpc*-*-* } }
 C { dg-options "-mcpu=power7 -O3 -w -ffast-math  -funroll-loops" }
       SUBROUTINE MAKTABS(IW,SOME,LBOX1,LBOX2,LBOX3,NSPACE,NA,NB,
      *            LBST,X,
diff --git a/gcc/testsuite/gfortran.dg/pr78259.f90 b/gcc/testsuite/gfortran.dg/pr78259.f90
index 82f48ea5f3e..4c40aacbcb7 100644
--- a/gcc/testsuite/gfortran.dg/pr78259.f90
+++ b/gcc/testsuite/gfortran.dg/pr78259.f90
@@ -1,4 +1,4 @@
-! { dg-do "compile" }
+! { dg-do compile }
 ! { dg-options "-fdec-structure" }
 !
 ! PR fortran/78259
diff --git a/gcc/testsuite/gfortran.dg/vect/vect-2.f90 b/gcc/testsuite/gfortran.dg/vect/vect-2.f90
index 956a05cc47c..f5dda6c1e93 100644
--- a/gcc/testsuite/gfortran.dg/vect/vect-2.f90
+++ b/gcc/testsuite/gfortran.dg/vect/vect-2.f90
@@ -16,4 +16,4 @@ END
 ! support unaligned loads).
 
 ! { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" } }
-! { dg-final { scan-tree-dump-times "Alignment of access forced using versioning." 3 "vect" {target { { vect_no_align && { ! vect_hw_misalign } } || { { ! vector_alignment_reachable  } && { ! vect_hw_misalign } } } } } }
+! { dg-final { scan-tree-dump-times "Alignment of access forced using versioning." 3 "vect" { target { { vect_no_align && { ! vect_hw_misalign } } || { { ! vector_alignment_reachable  } && { ! vect_hw_misalign } } } } } }