Fix testsuite race on additional_sources

* testsuite/lib/target-supports.exp (check_compile): Save/restore
	additional_sources that may belong to an actual test.

From-SVN: r220807
This commit is contained in:
Maxim Kuvyrkov 2015-02-19 08:25:30 +00:00 committed by Maxim Kuvyrkov
parent 1216ea72ef
commit 8a627e40a8
2 changed files with 14 additions and 0 deletions

View File

@ -1,3 +1,8 @@
2015-02-19 Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
* testsuite/lib/target-supports.exp (check_compile): Save/restore
additional_sources that may belong to an actual test.
2015-02-18 Jakub Jelinek <jakub@redhat.com>
PR gcov-profile/64634

View File

@ -41,6 +41,12 @@ proc check_compile {basename type contents args} {
global tool
verbose "check_compile tool: $tool for $basename"
# Save additional_sources to avoid compiling testsuite's sources
# against check_compile's source.
global additional_sources
set tmp_additional_sources "$additional_sources"
set additional_sources ""
if { [llength $args] > 0 } {
set options [list "additional_flags=[lindex $args 0]"]
} else {
@ -86,6 +92,9 @@ proc check_compile {basename type contents args} {
file delete $output
}
# Restore additional_sources.
set additional_sources "$tmp_additional_sources"
return [list $lines $scan_output]
}