From: Uros Bizjak <uros@gcc.gnu.org>
Date: Mon, 20 Sep 2010 22:15:17 +0000 (+0200)
Subject: gcc-dg.exp (clanup-stack-usage): Really remove .su files.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b379f67789d05ebe1cddd8a114e40a99eae030d8;p=gcc.git

gcc-dg.exp (clanup-stack-usage): Really remove .su files.

	* lib/gcc-dg.exp (clanup-stack-usage): Really remove .su files.

From-SVN: r164466
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d1bf076e4c0..ac22fff6f85 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-21  Uros Bizjak  <ubizjak@gmail.com>
+
+	* lib/gcc-dg.exp (clanup-stack-usage): Really remove .su files.
+
 2010-09-20  Janus Weil  <janus@gcc.gnu.org>
 
 	PR fortran/45438
@@ -8281,7 +8285,7 @@
 	* gfortran.dg/read_x_eof.f90: New test.
 	* gfortran.dg/read_x_past.f: Update test.
 
-2010-03-10  Jan Hubicka   <jh@suse.cz>
+2010-03-10  Jan Hubicka  <jh@suse.cz>
 
 	* gcc.c-torture/compile/pr43288.c: New test.
 
diff --git a/gcc/testsuite/gfortran.dg/inline_transpose_1.f90 b/gcc/testsuite/gfortran.dg/inline_transpose_1.f90
index 50290c6fad1..4995c4982eb 100644
--- a/gcc/testsuite/gfortran.dg/inline_transpose_1.f90
+++ b/gcc/testsuite/gfortran.dg/inline_transpose_1.f90
@@ -200,5 +200,5 @@ end
 ! { # Commented out as failing at -O0: dg-final { scan-tree-dump-times "_gfortran_abort" 32 "optimized" } }
 !
 ! cleanup
-! { #dg-final { cleanup-tree-dump "original" } }
+! { dg-final { cleanup-tree-dump "original" } }
 ! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index 53db283db33..e52a23fe0d4 100644
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -461,8 +461,21 @@ proc cleanup-ipa-dump { suffix } {
 }
 
 # Remove a stack usage file for the current test.
-proc cleanup-stack-usage { args } {
-  cleanup-dump "su"
+proc cleanup-stack-usage { } {
+    # This assumes that we are two frames down from dg-test or some other proc
+    # that stores the filename of the testcase in a local variable "name".
+    # A cleaner solution would require a new DejaGnu release.
+    upvar 2 name testcase
+    # The name might include a list of options; extract the file name.
+    set testcase [lindex $testcase 0]
+    remove-build-file "[file rootname [file tail $testcase]].su"
+
+    # Clean up files for additional source files.
+    if [info exists additional_sources] {
+	foreach srcfile $additional_sources {
+	    remove-build-file "[file rootname [file tail $srcfile]].su"
+	}
+    }
 }
 
 # Remove all dump files with the provided suffix.