gcc-dg.exp (cleanup-coverage-files): Remove options from test name.

	* lib/gcc-dg.exp (cleanup-coverage-files): Remove options from
	test name.
	(cleanup-repo-files): Ditto.
	(cleanup-saved-temps): Ditto.

From-SVN: r162583

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7bfba79f0f4d64a41b347590dfb120ca88f8bdb6..858c0ad12002e28028eb21dd842712891fcd8b42 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-27  Uros Bizjak  <ubizjak@gmail.com>
+
+       * lib/gcc-dg.exp (cleanup-coverage-files): Remove options from
+       test name.
+       (cleanup-repo-files): Ditto.
+       (cleanup-saved-temps): Ditto.
+
 2010-07-27  Jakub Jelinek  <jakub@redhat.com>
 
        PR testsuite/44701

diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index 512144a6aa678f60da816292c1d994b6402421a4..c9b31d10c7bd64ca151537569453e44e4495f7dc 100644 (file)
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -407,6 +407,8 @@ proc cleanup-coverage-files { } {
     # 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]].gc??"
 
     # Clean up coverage files for additional source files.
@@ -423,6 +425,8 @@ proc cleanup-repo-files { } {
     # 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]].o"
     remove-build-file "[file rootname [file tail $testcase]].rpo"
 
@@ -498,6 +502,8 @@ proc cleanup-saved-temps { args } {
     # 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]]
     foreach suffix $suffixes {
        remove-build-file "[file rootname [file tail $testcase]]$suffix"
        # -fcompare-debug dumps