Patchwork [testsuite] Add support for -fdump-ada-spec

login
register
mail settings
Submitter Eric Botcazou
Date Oct. 4, 2012, 11:10 a.m.
Message ID <2133991.HJNE3teHMl@polaris>
Download mbox | patch
Permalink /patch/189088/
State New
Headers show

Comments

Eric Botcazou - Oct. 4, 2012, 11:10 a.m.
Hi,

the recent breakage of -fdump-ada-spec revealed that the switch isn't 
exercised in the testsuite.  This patch adds the missing support.

Tested on x86_64-suse-linux, OK for mainline?  What of the 4.7 branch?


2012-10-04  Eric Botcazou  <ebotcazou@adacore.com>

	* lib/gcc-dg.exp (cleanup-ada-spec): New procedure.
	* lib/scanasm.exp (get_ada_spec_filename): Likewise.
	(scan-ada-spec): Likewise.
	(scan-ada-spec-not): Likewise.
	* gcc.dg/dump-ada-spec-1.c: New test.
	* g++.dg/other/dump-ada-spec-1.C: Likewise.
Mike Stump - Oct. 4, 2012, 3:38 p.m.
On Oct 4, 2012, at 4:10 AM, Eric Botcazou <ebotcazou@adacore.com> wrote:
> the recent breakage of -fdump-ada-spec revealed that the switch isn't 
> exercised in the testsuite.  This patch adds the missing support.
> 
> Tested on x86_64-suse-linux, OK for mainline?

Ok.

> What of the 4.7 branch?

I don't see the point…  But if you do…  let the dust settle… ok.

Patch

Index: lib/gcc-dg.exp
===================================================================
--- lib/gcc-dg.exp	(revision 192073)
+++ lib/gcc-dg.exp	(working copy)
@@ -503,6 +503,19 @@  proc cleanup-stack-usage { } {
     }
 }
 
+# Remove an Ada spec file for the current test.
+proc cleanup-ada-spec { } {
+    set testcase [testname-for-summary]
+    remove-build-file "[get_ada_spec_filename $testcase]"
+
+    # Clean up files for additional source files.
+    if [info exists additional_sources] {
+	foreach srcfile $additional_sources {
+	    remove-build-file "[get_ada_spec_filename $srcfile]"
+	}
+    }
+}
+
 # Remove all dump files with the provided suffix.
 proc cleanup-dump { suffix } {
     set testcase [testname-for-summary]
Index: lib/scanasm.exp
===================================================================
--- lib/scanasm.exp	(revision 192073)
+++ lib/scanasm.exp	(working copy)
@@ -184,6 +184,38 @@  proc scan-stack-usage-not { args } {
     dg-scan "scan-file-not" 0 $testcase $output_file $args
 }
 
+# Return the filename of the Ada spec corresponding to the argument.
+
+proc get_ada_spec_filename { testcase } {
+    # The name might include a list of options; extract the file name.
+    set filename  [lindex $testcase 0]
+    set tailname  [file tail $filename]
+    set extension [string trimleft [file extension $tailname] {.}]
+    set rootname  [regsub -all {\-} [file rootname $tailname] {_}]
+
+    return [string tolower "${rootname}_${extension}.ads"]
+}
+
+# Look for a pattern in the .ads file produced by the compiler.  See
+# dg-scan for details.
+
+proc scan-ada-spec { args } {
+    set testcase  [testname-for-summary]
+    set output_file "[get_ada_spec_filename $testcase]"
+
+    dg-scan "scan-file" 1 $testcase $output_file $args
+}
+
+# Check that a pattern is not present in the .ads file produced by the
+# compiler.  See dg-scan for details.
+
+proc scan-ada-spec-not { args } {
+    set testcase  [testname-for-summary]
+    set output_file "[get_ada_spec_filename $testcase]"
+
+    dg-scan "scan-file-not" 0 $testcase $output_file $args
+}
+
 # Call pass if pattern is present given number of times, otherwise fail.
 proc scan-assembler-times { args } {
     if { [llength $args] < 2 } {
Index: gcc.dg/dump-ada-spec-1.c
===================================================================
--- gcc.dg/dump-ada-spec-1.c	(revision 0)
+++ gcc.dg/dump-ada-spec-1.c	(revision 0)
@@ -0,0 +1,10 @@ 
+/* { dg-do compile } */
+/* { dg-options "-fdump-ada-spec" } */
+
+struct S
+{
+  int i;
+};
+
+/* { dg-final { scan-ada-spec "type S is record" } } */
+/* { dg-final { cleanup-ada-spec } } */
Index: g++.dg/other/dump-ada-spec-1.C
===================================================================
--- g++.dg/other/dump-ada-spec-1.C	(revision 0)
+++ g++.dg/other/dump-ada-spec-1.C	(revision 0)
@@ -0,0 +1,10 @@ 
+/* { dg-do compile } */
+/* { dg-options "-fdump-ada-spec" } */
+
+struct S
+{
+  int i;
+};
+
+/* { dg-final { scan-ada-spec "type S is record" } } */
+/* { dg-final { cleanup-ada-spec } } */