From 2b948876d87065efd5c0aeabe828a586b9454cbd Mon Sep 17 00:00:00 2001 From: Janis Johnson Date: Tue, 6 Dec 2005 20:50:27 +0000 Subject: [PATCH] * lib/gcc-dg.exp (cleanup-dump): Remove options from test name. From-SVN: r108129 --- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/lib/gcc-dg.exp | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 35f45eacce1..45d0af7a9ac 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2005-12-06 Janis Johnson + + * lib/gcc-dg.exp (cleanup-dump): Remove options from test name. + 2005-12-06 Roger Sayle * g++.dg/warn/Wstring-literal-comparison-1.C: New test case. diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp index 68c4aacf8e8..6fb94e01ec7 100644 --- a/gcc/testsuite/lib/gcc-dg.exp +++ b/gcc/testsuite/lib/gcc-dg.exp @@ -367,7 +367,9 @@ proc cleanup-dump { suffix } { # proc that stores the filename of the testcase in a local variable # "name". A cleaner solution would require a new DejaGnu release. upvar 3 name testcase - remove-build-file "[file tail $testcase].$suffix" + # The name might include a list of options; extract the file name. + set src [file tail [lindex $testcase 0]] + remove-build-file "[file tail $src].$suffix" # Clean up dump files for additional source files. if [info exists additional_sources] {