c-torture.exp (c-torture-compile, [...]): Treat $srcdir as a literal.

	* lib/c-torture.exp (c-torture-compile, c-torture-execute):
	Treat $srcdir as a literal.
	* lib/fortran-torture.exp (fortran-torture-compile,
	fortran-torture-execute): Likewise.
	* lib/objc-torture.exp (objc-torture-compile,
	objc-torture-execute): Likewise.
	* lib/profopt.exp (profopt-execute): Likewise.

From-SVN: r116894

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 77582efab205f4fed24fb3963b68b69f83a3d2d2..885bcd7303b4e7938fdacd79f859a301db6f2013 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2006-09-12  Kazu Hirata  <kazu@codesourcery.com>
+
+       * lib/c-torture.exp (c-torture-compile, c-torture-execute):
+       Treat $srcdir as a literal.
+       * lib/fortran-torture.exp (fortran-torture-compile,
+       fortran-torture-execute): Likewise.
+       * lib/objc-torture.exp (objc-torture-compile,
+       objc-torture-execute): Likewise.
+       * lib/profopt.exp (profopt-execute): Likewise.
+
 2006-09-11  Geoffrey Keating  <geoffk@apple.com>
 
        * gcc.dg/debug/dwarf2/dwarf-file1.c: New.

diff --git a/gcc/testsuite/lib/c-torture.exp b/gcc/testsuite/lib/c-torture.exp
index c14876dc0d6838a42bae313cb3bdd8d678777cba..c9138d660686d1eb5a5a696317e468649e74f7a5 100644 (file)
--- a/gcc/testsuite/lib/c-torture.exp
+++ b/gcc/testsuite/lib/c-torture.exp
@@ -65,7 +65,7 @@ proc c-torture-compile { src option } {
 
     set output "$tmpdir/[file tail [file rootname $src]].o"
 
-    regsub "^$srcdir/?" $src "" testcase
+    regsub "(?q)$srcdir/" $src "" testcase
     # If we couldn't rip $srcdir out of `src' then just do the best we can.
     # The point is to reduce the unnecessary noise in the logs.  Don't strip
     # out too much because different testcases with the same name can confuse
@@ -127,7 +127,7 @@ proc c-torture-execute { sources args } {
 
     set executable $tmpdir/[file tail [file rootname $src].x]
 
-    regsub "^$srcdir/?" $src "" testcase
+    regsub "(?q)$srcdir/" $src "" testcase
     # If we couldn't rip $srcdir out of `src' then just do the best we can.
     # The point is to reduce the unnecessary noise in the logs.  Don't strip
     # out too much because different testcases with the same name can confuse

diff --git a/gcc/testsuite/lib/fortran-torture.exp b/gcc/testsuite/lib/fortran-torture.exp
index 182711553ce2652b40ee3929a5927d5891964ace..feb3c03fc9d9104cde0e085f02c08130a6c646d6 100644 (file)
--- a/gcc/testsuite/lib/fortran-torture.exp
+++ b/gcc/testsuite/lib/fortran-torture.exp
@@ -54,7 +54,7 @@ proc fortran-torture-compile { src option } {
 
     set output "$tmpdir/[file tail [file rootname $src]].o"
 
-    regsub "^$srcdir/?" $src "" testcase
+    regsub "(?q)$srcdir/" $src "" testcase
 
     # If we couldn't rip $srcdir out of `src' then just do the best we can.
     # The point is to reduce the unnecessary noise in the logs.  Don't strip
@@ -158,7 +158,7 @@ proc fortran-torture-execute { src } {
     # Setup the options for the testcase run.
     set option_list $TORTURE_OPTIONS
     set executable $tmpdir/[file tail [file rootname $src].x]
-    regsub "^$srcdir/?" $src "" testcase
+    regsub "(?q)$srcdir/" $src "" testcase
 
     # If we couldn't rip $srcdir out of `src' then just do the best we can.
     # The point is to reduce the unnecessary noise in the logs.  Don't strip

diff --git a/gcc/testsuite/lib/objc-torture.exp b/gcc/testsuite/lib/objc-torture.exp
index 09d0c7761ff1d13a583ec03a6988ffdafb136b75..4d52a3de6f10f73006d84f4652b61b3b0150a38e 100644 (file)
--- a/gcc/testsuite/lib/objc-torture.exp
+++ b/gcc/testsuite/lib/objc-torture.exp
@@ -88,7 +88,7 @@ proc objc-torture-compile { src option } {
 
     set output "$tmpdir/[file tail [file rootname $src]].o"
 
-    regsub "^$srcdir/?" $src "" testcase
+    regsub "(?q)$srcdir/" $src "" testcase
     # If we couldn't rip $srcdir out of `src' then just do the best we can.
     # The point is to reduce the unnecessary noise in the logs.  Don't strip
     # out too much because different testcases with the same name can confuse
@@ -146,7 +146,7 @@ proc objc-torture-execute { src args } {
 
     set executable $tmpdir/[file tail [file rootname $src].x]
 
-    regsub "^$srcdir/?" $src "" testcase
+    regsub "(?q)$srcdir/" $src "" testcase
     # If we couldn't rip $srcdir out of `src' then just do the best we can.
     # The point is to reduce the unnecessary noise in the logs.  Don't strip
     # out too much because different testcases with the same name can confuse

diff --git a/gcc/testsuite/lib/profopt.exp b/gcc/testsuite/lib/profopt.exp
index a33742cdb850611b4e9c8f1aae07c3c8c2035c91..0ba87fef497a870ab6e113f90c28e960a4e65f59 100644 (file)
--- a/gcc/testsuite/lib/profopt.exp
+++ b/gcc/testsuite/lib/profopt.exp
@@ -221,7 +221,7 @@ proc profopt-execute { src } {
         error "No feedback option specified for second compile."
     }
 
-    regsub "^$srcdir/?" $src "" testcase
+    regsub "(?q)$srcdir/" $src "" testcase
     # If we couldn't rip $srcdir out of `src' then just do the best we can.
     # The point is to reduce the unnecessary noise in the logs.  Don't strip
     # out too much because different testcases with the same name can confuse