* lib/compat.exp (compat-execute): Fix processing of file names.

From-SVN: r123270

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c8096ade24e9471d7f58df1368fb64d9bb7e22a2..400707811969f06f629b6c82e0551cb476d354e7 100644 (file)
--- 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 86a437fe40ba409d3c60453f571de3f4f5381fdf..6e15f91e3de90680e43332665655dad3191c7e71 100644 (file)
--- 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