diff options
| author | janis <janis@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-06-25 22:01:34 +0000 |
|---|---|---|
| committer | janis <janis@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-06-25 22:01:34 +0000 |
| commit | 5d1859c8546ba5927fb7f1d43dc52fcd3b7d81c1 (patch) | |
| tree | 1a1736c634dcac65c5584ae5502f3e5b015d2569 /gcc/testsuite/lib | |
| parent | d28e989527a64afa3738b44017c6df6cb245db89 (diff) | |
| download | gcc-5d1859c8546ba5927fb7f1d43dc52fcd3b7d81c1.tar.gz | |
* lib/profopt.exp: Make prof_option_list local to profopt-execute.
* g++.dg/tree-prof/tree-prof.exp (PROFOPT_OPTIONS): Define after
including profopt.opt; save and restore existing value.
* g++.dg/bprob/bprob.exp: Likewise.
* gcc.dg/matrix/matrix.exp: Likewise.
* gcc.dg/tree-prof/tree-prof.exp: Likewise.
* gcc.misc-tests/bprob.exp: Likewise; also replace formerly-ignored
PROFOPT_OPTIONS.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@188964 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/testsuite/lib')
| -rw-r--r-- | gcc/testsuite/lib/profopt.exp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gcc/testsuite/lib/profopt.exp b/gcc/testsuite/lib/profopt.exp index 5e0f9a28ee1..f0dbee720e5 100644 --- a/gcc/testsuite/lib/profopt.exp +++ b/gcc/testsuite/lib/profopt.exp @@ -64,8 +64,6 @@ if ![info exists PROFOPT_OPTIONS] { { -Os } ] } -set prof_option_list $PROFOPT_OPTIONS - # # profopt-cleanup -- remove profiling or performance results files. # @@ -215,7 +213,7 @@ proc profopt-get-options { src } { # proc profopt-execute { src } { global srcdir tmpdir - global prof_option_list + global PROFOPT_OPTIONS global tool profile_option feedback_option prof_ext perf_ext perf_delta global generate_final_code use_final_code global verbose @@ -227,6 +225,12 @@ proc profopt-execute { src } { error "No feedback option specified for second compile." } + # Use the default option list or one defined for a set of tests. + if ![info exists PROFOPT_OPTIONS] { + error "PROFOPT_OPTIONS is not defined" + } + set prof_option_list $PROFOPT_OPTIONS + 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 |