diff options
| author | Janis Johnson <janis187@us.ibm.com> | 2007-03-27 22:06:00 +0000 |
|---|---|---|
| committer | Janis Johnson <janis@gcc.gnu.org> | 2007-03-27 22:06:00 +0000 |
| commit | 28e08d3cdfc51640becdfdbc6a118d9044f384f7 (patch) | |
| tree | 7f81470708ebdf445df11945cd2907315541cada | |
| parent | c97d6ac3ed782b89daa8db785749676b34f5d20b (diff) | |
| download | gcc-28e08d3cdfc51640becdfdbc6a118d9044f384f7.zip gcc-28e08d3cdfc51640becdfdbc6a118d9044f384f7.tar.gz gcc-28e08d3cdfc51640becdfdbc6a118d9044f384f7.tar.bz2 | |
* lib/compat.exp (compat-execute): Fix processing of file names.
From-SVN: r123270
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/lib/compat.exp | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c8096ad..4007078 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2007-03-27 Janis Johnson <janis187@us.ibm.com> + + * lib/compat.exp (compat-execute): Fix processing of file names. + 2007-03-27 Daniel Jacobowitz <dan@codesourcery.com> * gcc.target/powerpc/ppc-stackalign-1.c: Run for powerpc-eabi. diff --git a/gcc/testsuite/lib/compat.exp b/gcc/testsuite/lib/compat.exp index 86a437f..6e15f91 100644 --- a/gcc/testsuite/lib/compat.exp +++ b/gcc/testsuite/lib/compat.exp @@ -259,10 +259,13 @@ proc compat-execute { src1 sid use_alt } { } # Set up the names of the other source files. - regsub "_main.*" $src1 "" base - regsub ".*/" $base "" base - regsub "_main" $src1 "_x" src2 - regsub "_main" $src1 "_y" src3 + set dir [file dirname $src1] + set ext [file extension $src1] + set base [file rootname $src1] + set base [string range $base [string length $dir] end] + regsub "_main" $base "" base + set src2 "${dir}/${base}_x${ext}" + set src3 "${dir}/${base}_y${ext}" # Use the dg-options mechanism to specify extra flags for this test. # The extra flags in each file are used to compile that file, and the |