From f63fc0d933c16105877f57f19a4500e8afabc47d Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Tue, 12 Sep 2006 17:12:49 +0000 Subject: [PATCH] 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 --- gcc/testsuite/ChangeLog | 10 ++++++++++ gcc/testsuite/lib/c-torture.exp | 4 ++-- gcc/testsuite/lib/fortran-torture.exp | 4 ++-- gcc/testsuite/lib/objc-torture.exp | 4 ++-- gcc/testsuite/lib/profopt.exp | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 77582efab20..885bcd7303b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2006-09-12 Kazu Hirata + + * 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 * 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 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 182711553ce..feb3c03fc9d 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 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