diff options
| author | Kazu Hirata <kazu@codesourcery.com> | 2006-09-12 17:17:00 +0000 |
|---|---|---|
| committer | Kazu Hirata <kazu@codesourcery.com> | 2006-09-12 17:17:00 +0000 |
| commit | fe4c807c2ea3f974de2d788d08e3771589c3a878 (patch) | |
| tree | d35d90eaddaaa9dc1a7c5eee5c238ffbee14c289 | |
| parent | 666c074b3543680e00ff62c6fefc24b2258f4aa6 (diff) | |
Backport from mainline:csl/arm/2006q3-19
gcc/testsuite/
* 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.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/csl/sourcerygxx-4_1@116897 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog.csl | 12 | ||||
| -rw-r--r-- | gcc/testsuite/lib/c-torture.exp | 4 | ||||
| -rw-r--r-- | gcc/testsuite/lib/fortran-torture.exp | 4 | ||||
| -rw-r--r-- | gcc/testsuite/lib/objc-torture.exp | 4 | ||||
| -rw-r--r-- | gcc/testsuite/lib/profopt.exp | 2 |
5 files changed, 19 insertions, 7 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index 1225313a69e..e01869e0e7d 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,15 @@ +2006-09-12 Kazu Hirata <kazu@codesourcery.com> + + Backport from mainline: + gcc/testsuite/ + * 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-12 Nathan Sidwell <nathan@codesourcery.com> gcc/ diff --git a/gcc/testsuite/lib/c-torture.exp b/gcc/testsuite/lib/c-torture.exp index c14876dc0d6..c9138d66068 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 2f05ba55c46..79bee16c616 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 @@ -152,7 +152,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 09d0c7761ff..4d52a3de6f1 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 a33742cdb85..0ba87fef497 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 |