This replaces the scanning of the -fstack-usage output with -Wstack-usage.
Tested on x86-64/Linux, applied on the mainline and 8 branch.
2018-05-31 Eric Botcazou <ebotca...@adacore.com>
* gnat.dg/stack_usage1.adb: Replace -fstack-usage with -Wstack-usage.
* gnat.dg/stack_usage1b.adb: Likewise.
* gnat.dg/stack_usage1c.adb: Likewise.
* gnat.dg/stack_usage3.adb: Likewise.
* gnat.dg/stack_usage1_pkg.adb: Delete.
--
Eric Botcazou
Index: gnat.dg/stack_usage1.adb
===================================================================
--- gnat.dg/stack_usage1.adb (revision 260913)
+++ gnat.dg/stack_usage1.adb (working copy)
@@ -1,5 +1,5 @@
-- { dg-do compile }
--- { dg-options "-fstack-usage" }
+-- { dg-options "-Wstack-usage=128" { target i?86-*-* x86_64-*-* } }
with Stack_Usage1_Pkg; use Stack_Usage1_Pkg;
@@ -34,6 +34,3 @@ begin
end case;
end Stack_Usage1;
-
--- { dg-final { scan-stack-usage "\t\[0-9\]\[0-9\]\t" { target i?86-*-* x86_64-*-* } } }
--- { dg-final { cleanup-stack-usage } }
Index: gnat.dg/stack_usage1_pkg.adb
===================================================================
--- gnat.dg/stack_usage1_pkg.adb (revision 260913)
+++ gnat.dg/stack_usage1_pkg.adb (nonexistent)
@@ -1,13 +0,0 @@
-package body Stack_Usage1_Pkg is
-
- function Ident_Int (X : Integer) return Integer is
- begin
- return X;
- end Ident_Int;
-
- procedure My_Proc (X : R) is
- begin
- null;
- end My_Proc;
-
-end Stack_Usage1_Pkg;
Index: gnat.dg/stack_usage1b.adb
===================================================================
--- gnat.dg/stack_usage1b.adb (revision 260913)
+++ gnat.dg/stack_usage1b.adb (working copy)
@@ -1,5 +1,5 @@
-- { dg-do compile }
--- { dg-options "-O -fstack-usage" }
+-- { dg-options "-O -Wstack-usage=128" { target i?86-*-* x86_64-*-* } }
with Stack_Usage1_Pkg; use Stack_Usage1_Pkg;
@@ -34,6 +34,3 @@ begin
end case;
end Stack_Usage1b;
-
--- { dg-final { scan-stack-usage "\t\[0-9\]\[0-9\]\t" { target i?86-*-* x86_64-*-* } } }
--- { dg-final { cleanup-stack-usage } }
Index: gnat.dg/stack_usage1c.adb
===================================================================
--- gnat.dg/stack_usage1c.adb (revision 260913)
+++ gnat.dg/stack_usage1c.adb (working copy)
@@ -1,5 +1,5 @@
-- { dg-do compile }
--- { dg-options "-O2 -fstack-usage" }
+-- { dg-options "-O2 -Wstack-usage=128" { target i?86-*-* x86_64-*-* } }
with Stack_Usage1_Pkg; use Stack_Usage1_Pkg;
@@ -34,6 +34,3 @@ begin
end case;
end Stack_Usage1c;
-
--- { dg-final { scan-stack-usage "\t\[0-9\]\[0-9\]\t" { target i?86-*-* x86_64-*-* } } }
--- { dg-final { cleanup-stack-usage } }
Index: gnat.dg/stack_usage3.adb
===================================================================
--- gnat.dg/stack_usage3.adb (revision 260913)
+++ gnat.dg/stack_usage3.adb (working copy)
@@ -1,5 +1,5 @@
-- { dg-do compile }
--- { dg-options "-O -fstack-usage" }
+-- { dg-options "-O -Wstack-usage=1024" }
with Ada.Text_IO; use Ada.Text_IO;
with Stack_Usage3_Pkg; use Stack_Usage3_Pkg;
@@ -27,6 +27,3 @@ begin
Put_Line (Diag ("Diag line 19"));
Put_Line (Diag ("Diag line 20"));
end;
-
--- { dg-final { scan-stack-usage-not "\t\[0-9\]\[0-9\]\[0-9\]\[0-9\]\t" } }
--- { dg-final { cleanup-stack-usage } }