opt20.ads: Move dg directive to...

	* gnat.dg/opt20.ads: Move dg directive to...
	* gnat.dg/opt20.adb: ...here.
	* gnat.dg/addr1.ad[sb]: Likewise.
	* gnat.dg/concat2.ad[sb]: Likewise.
	* gnat.dg/array16.ad[sb]: Likewise.
	* gnat.dg/atomic5.ad[sb]: Likewise.
	* gnat.dg/discr29.ad[sb]: Likewise.
	* gnat.dg/noreturn5.ad[sb]: Likewise.
	* gnat.dg/vect8.ad[sb]: Likewise.  Add dg-options.
	* gnat.dg/discr23.ads: Remove dg directive.
	* gnat.dg/nested_float_packed.ads: Likewise.
	* gnat.dg/oconst6.ads: Move to...
	* gnat.dg/specs/oconst6.ads: ...here.

From-SVN: r191592

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e419eb121ac4dc004c4d1c4bb158afa81156938a..4d1f9172c9646de2ef080b742b4c3d5b377180ba 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,19 @@
+2012-09-20  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gnat.dg/opt20.ads: Move dg directive to...
+       * gnat.dg/opt20.adb: ...here.
+       * gnat.dg/addr1.ad[sb]: Likewise.
+       * gnat.dg/concat2.ad[sb]: Likewise.
+       * gnat.dg/array16.ad[sb]: Likewise.
+       * gnat.dg/atomic5.ad[sb]: Likewise.
+       * gnat.dg/discr29.ad[sb]: Likewise.
+       * gnat.dg/noreturn5.ad[sb]: Likewise.
+       * gnat.dg/vect8.ad[sb]: Likewise.  Add dg-options.
+       * gnat.dg/discr23.ads: Remove dg directive.
+       * gnat.dg/nested_float_packed.ads: Likewise.
+       * gnat.dg/oconst6.ads: Move to...
+       * gnat.dg/specs/oconst6.ads: ...here.
+
 2012-09-20  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/52432

diff --git a/gcc/testsuite/gnat.dg/addr1.adb b/gcc/testsuite/gnat.dg/addr1.adb
index 521d0495a9bcb32bd2724e88e991ee2e1812ee7e..5f5ff53563361cccb533efcc5153198c3c85ad55 100644 (file)
--- a/gcc/testsuite/gnat.dg/addr1.adb
+++ b/gcc/testsuite/gnat.dg/addr1.adb
@@ -1,3 +1,5 @@
+--  { dg-do compile }
+
 with System;
 package body addr1 is
    task type T is

diff --git a/gcc/testsuite/gnat.dg/addr1.ads b/gcc/testsuite/gnat.dg/addr1.ads
index 51061fde08920eff9d5743eac45e9de4be03e16a..99496cd51473dbf6de3cd80a040ecfe0631bbeec 100644 (file)
--- a/gcc/testsuite/gnat.dg/addr1.ads
+++ b/gcc/testsuite/gnat.dg/addr1.ads
@@ -1,5 +1,3 @@
---  { dg-do compile }
-
 package addr1 is
    pragma Elaborate_Body;
 end;

diff --git a/gcc/testsuite/gnat.dg/array16.adb b/gcc/testsuite/gnat.dg/array16.adb
index 18abf8f8199d61fb8ac39be387dab94628a06276..be61cb93c79e02a3abc54dc4876d914dae71723e 100644 (file)
--- a/gcc/testsuite/gnat.dg/array16.adb
+++ b/gcc/testsuite/gnat.dg/array16.adb
@@ -1,3 +1,6 @@
+-- { dg-do compile }
+-- { dg-options "-O -gnatn -fdump-tree-optimized" }
+
 package body Array16 is
 
   function F1 (A : access My_T1) return My_T1 is
@@ -20,3 +23,6 @@ package body Array16 is
   end;
 
 end Array16;
+
+-- { dg-final { scan-tree-dump-not "secondary_stack" "optimized" } }
+-- { dg-final { cleanup-tree-dump "optimized" } }

diff --git a/gcc/testsuite/gnat.dg/array16.ads b/gcc/testsuite/gnat.dg/array16.ads
index 69452c98f3ae525b11c8554aea5d98606f2adad5..a54a2df45d610bf13419528b4d02979ee8902f12 100644 (file)
--- a/gcc/testsuite/gnat.dg/array16.ads
+++ b/gcc/testsuite/gnat.dg/array16.ads
@@ -1,6 +1,3 @@
--- { dg-do compile }
--- { dg-options "-O -gnatn -fdump-tree-optimized" }
-
 with Array16_Pkg;
 
 package Array16 is
@@ -26,6 +23,3 @@ package Array16 is
   procedure Proc (A : access My_T1; B : access My_T2);
 
 end Array16;
-
--- { dg-final { scan-tree-dump-not "secondary_stack" "optimized" } }
--- { dg-final { cleanup-tree-dump "optimized" } }

diff --git a/gcc/testsuite/gnat.dg/atomic5.adb b/gcc/testsuite/gnat.dg/atomic5.adb
index efbed4e34ac0f02b39af5ff88b6704354153b9a2..d17e6ff1ce9c46e5e136be33bebec950a4babb0d 100644 (file)
--- a/gcc/testsuite/gnat.dg/atomic5.adb
+++ b/gcc/testsuite/gnat.dg/atomic5.adb
@@ -1,3 +1,5 @@
+-- { dg-do compile }
+
 package body Atomic5 is
 
   function Create return R is

diff --git a/gcc/testsuite/gnat.dg/atomic5.ads b/gcc/testsuite/gnat.dg/atomic5.ads
index 3f653fa1151a6ba5b042af2684fda2114a80dc61..ce702ba1c93dfbcfb1b18c65ad4cd8874c0e4266 100644 (file)
--- a/gcc/testsuite/gnat.dg/atomic5.ads
+++ b/gcc/testsuite/gnat.dg/atomic5.ads
@@ -1,5 +1,3 @@
--- { dg-do compile }
-
 with Unchecked_Conversion;
 
 package Atomic5 is

diff --git a/gcc/testsuite/gnat.dg/concat2.adb b/gcc/testsuite/gnat.dg/concat2.adb
index 221c4a310db0255d08d48460e22bd6333bf1df71..a642d26445063204367a85bd9700ac7469b173f2 100644 (file)
--- a/gcc/testsuite/gnat.dg/concat2.adb
+++ b/gcc/testsuite/gnat.dg/concat2.adb
@@ -1,3 +1,6 @@
+-- { dg-do compile }
+-- { dg-options "-O" }
+
 with Text_IO; use Text_IO;
 
 package body Concat2 is
@@ -15,4 +18,3 @@ package body Concat2 is
    end;
 
 end Concat2;
-

diff --git a/gcc/testsuite/gnat.dg/concat2.ads b/gcc/testsuite/gnat.dg/concat2.ads
index 01e620be0a6257f947effc4c75f1fbdb0af75351..9f90cbb0eaaad1582b71861d2e568b56e2ab8197 100644 (file)
--- a/gcc/testsuite/gnat.dg/concat2.ads
+++ b/gcc/testsuite/gnat.dg/concat2.ads
@@ -1,6 +1,3 @@
--- { dg-do compile }
--- { dg-options "-O" }
-
 package Concat2 is
 
    procedure Browse;

diff --git a/gcc/testsuite/gnat.dg/discr23.ads b/gcc/testsuite/gnat.dg/discr23.ads
index 8e673b382a9b22bdcfa70e484809b30e2d9d3a4a..960dcdaf8cc96a23707b9590bf61ae5c32d3a48c 100644 (file)
--- a/gcc/testsuite/gnat.dg/discr23.ads
+++ b/gcc/testsuite/gnat.dg/discr23.ads
@@ -1,5 +1,3 @@
--- { dg-do compile }
-
 package Discr23 is
 
   procedure Dummy;

diff --git a/gcc/testsuite/gnat.dg/discr29.adb b/gcc/testsuite/gnat.dg/discr29.adb
index 56047c9cf6eeb27926e6b006df7337397fa438a1..834437f6fb8e5b139ef157e017fbd68b1d86310d 100644 (file)
--- a/gcc/testsuite/gnat.dg/discr29.adb
+++ b/gcc/testsuite/gnat.dg/discr29.adb
@@ -1,3 +1,5 @@
+-- { dg-do compile }
+
 package body Discr29 is
 
    procedure Proc (R : out Rec3) is

diff --git a/gcc/testsuite/gnat.dg/discr29.ads b/gcc/testsuite/gnat.dg/discr29.ads
index a205bc1e0dd5a66f8d114d694d10861eb8369952..6bbf16725edf2850ca8799bc9331021b1b5fa173 100644 (file)
--- a/gcc/testsuite/gnat.dg/discr29.ads
+++ b/gcc/testsuite/gnat.dg/discr29.ads
@@ -1,5 +1,3 @@
--- { dg-do compile }
-
 package Discr29 is
 
    type Rec1 is record

diff --git a/gcc/testsuite/gnat.dg/nested_float_packed.ads b/gcc/testsuite/gnat.dg/nested_float_packed.ads
index ae7f52390684948a6a9429c8d0f82c03c88cb789..46b9e803fcd58bd6475e7cc30760b3c5125b8d42 100644 (file)
--- a/gcc/testsuite/gnat.dg/nested_float_packed.ads
+++ b/gcc/testsuite/gnat.dg/nested_float_packed.ads
@@ -1,5 +1,3 @@
--- { dg-do compile }
-
 package Nested_Float_Packed is
 
    type Float_Type is record
@@ -20,5 +18,3 @@ package Nested_Float_Packed is
    Data_Block : array (Range_Type)
      of Data_Type := (others => Default_Data);
 end;
-
-

diff --git a/gcc/testsuite/gnat.dg/noreturn5.adb b/gcc/testsuite/gnat.dg/noreturn5.adb
index 2f7599097692c377603e6e744909ef6e3abcdb5d..59b05da92feee1e2baa7981a4334f2cd3c12762f 100644 (file)
--- a/gcc/testsuite/gnat.dg/noreturn5.adb
+++ b/gcc/testsuite/gnat.dg/noreturn5.adb
@@ -1,3 +1,5 @@
+-- { dg-do compile }
+
 with Ada.Characters.Handling; use Ada.Characters.Handling;
 with GNAT.OS_Lib;             use GNAT.OS_Lib;
 with Text_IO;                 use Text_IO;

diff --git a/gcc/testsuite/gnat.dg/noreturn5.ads b/gcc/testsuite/gnat.dg/noreturn5.ads
index 4da5c1e09066e024bc5501ee4c9cfe48868a6d56..433f0e63beef43feef4276bfb242669723670a8d 100644 (file)
--- a/gcc/testsuite/gnat.dg/noreturn5.ads
+++ b/gcc/testsuite/gnat.dg/noreturn5.ads
@@ -1,5 +1,3 @@
--- { dg-do compile }
-
 package Noreturn5 is
 
    procedure Proc (Arg_Line : Wide_String; Keep_Going : Boolean);

diff --git a/gcc/testsuite/gnat.dg/opt20.adb b/gcc/testsuite/gnat.dg/opt20.adb
index 6d3e240bab5f1c218f0506bc750a2b4fea67afd9..00e41b4a494d89e324f237a0c93e08847a180c94 100644 (file)
--- a/gcc/testsuite/gnat.dg/opt20.adb
+++ b/gcc/testsuite/gnat.dg/opt20.adb
@@ -1,3 +1,6 @@
+-- { dg-do compile }
+-- { dg-options "-O2 -gnatpn" }
+
 with Ada.Characters.Handling; use Ada.Characters.Handling;
 
 package body Opt20 is

diff --git a/gcc/testsuite/gnat.dg/opt20.ads b/gcc/testsuite/gnat.dg/opt20.ads
index 58833bfab4b043f05bb2f1b9de037192dfd2a191..ec547ee88f417ff0c628952d6d4f0babf9f62028 100644 (file)
--- a/gcc/testsuite/gnat.dg/opt20.ads
+++ b/gcc/testsuite/gnat.dg/opt20.ads
@@ -1,6 +1,3 @@
--- { dg-do compile }
--- { dg-options "-O2 -gnatpn" }
-
 with Opt20_Pkg; use Opt20_Pkg;
 
 package Opt20 is

diff --git a/gcc/testsuite/gnat.dg/oconst6.ads b/gcc/testsuite/gnat.dg/specs/oconst6.ads
similarity index 100%
rename from gcc/testsuite/gnat.dg/oconst6.ads
rename to gcc/testsuite/gnat.dg/specs/oconst6.ads

diff --git a/gcc/testsuite/gnat.dg/vect8.adb b/gcc/testsuite/gnat.dg/vect8.adb
index b13555abd0fe6f9c8c443480e28cb716c75c0820..7b1cecf083b0fc4051ce2e8b9bec376ac3d9885c 100644 (file)
--- a/gcc/testsuite/gnat.dg/vect8.adb
+++ b/gcc/testsuite/gnat.dg/vect8.adb
@@ -1,3 +1,6 @@
+-- { dg-do compile }
+-- { dg-options "-w" }
+
 package body Vect8 is
 
    function Foo (V : Vec) return Vec is

diff --git a/gcc/testsuite/gnat.dg/vect8.ads b/gcc/testsuite/gnat.dg/vect8.ads
index 5406c70f49f74f8a597ccfda35ab06ef974e6b9e..c926cd51ffa8c55c12754688c5dd89250780eef4 100644 (file)
--- a/gcc/testsuite/gnat.dg/vect8.ads
+++ b/gcc/testsuite/gnat.dg/vect8.ads
@@ -1,5 +1,3 @@
--- { dg-do compile }
-
 package Vect8 is
 
    type Vec is array (1 .. 2) of Long_Float;