aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKazu Hirata <kazu@codesourcery.com>2006-09-12 17:12:49 +0000
committerKazu Hirata <kazu@gcc.gnu.org>2006-09-12 17:12:49 +0000
commitf63fc0d933c16105877f57f19a4500e8afabc47d (patch)
treeddb3effbb89e3f4ae814fa5592f54b2f7faddb37
parentb095810f1be43c39cd42b57bb06930c9538429bf (diff)
downloadgcc-f63fc0d933c16105877f57f19a4500e8afabc47d.zip
gcc-f63fc0d933c16105877f57f19a4500e8afabc47d.tar.gz
gcc-f63fc0d933c16105877f57f19a4500e8afabc47d.tar.bz2
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
-rw-r--r--gcc/testsuite/ChangeLog10
-rw-r--r--gcc/testsuite/lib/c-torture.exp4
-rw-r--r--gcc/testsuite/lib/fortran-torture.exp4
-rw-r--r--gcc/testsuite/lib/objc-torture.exp4
-rw-r--r--gcc/testsuite/lib/profopt.exp2
5 files changed, 17 insertions, 7 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 77582ef..885bcd7 100644
--- 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 c14876d..c9138d6 100644
--- 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 1827115..feb3c03 100644
--- 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 09d0c77..4d52a3d 100644
--- 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 a33742c..0ba87fe 100644
--- 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