diff mbox

Fix environment variables restoring in GCC testsuite.

Message ID 53F71DD4.1040404@partner.samsung.com
State New
Headers show

Commit Message

max Aug. 22, 2014, 10:39 a.m. UTC 
Hi,

When testing, I've noticed, that Asan-bootstrapped GCC should be 
executed with ASAN_OPTIONS=detect_leaks=0 because of memory leaks in 
GCC, reported by Leak Sanitizer.

When I ran Asan test on Asan-bootstrapped GCC, some of them fail with 
memory leaks into GCC, even if Lsan is disabled. This caused by slightly 
wrong logic in saving/restoring env variables functionality in 
gcc-dg.exp (some tests override ASAN_OPTIONS and this env variable isn't 
restored correcty).

This tiny patch seems to fix the issue.

Tested on x86_64-pc-linux-gnu.

Ok to commit?

-Maxim
diff mbox

Patch

gcc/testsuite/ChangeLog:

2014-08-22  Max Ostapenko  <m.ostapenko@partner.samsung.com>

	* lib/gcc-dg.exp: Change pattern.

diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index 3390caa..d438c05 100644
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -295,8 +295,8 @@  proc set-target-env-var { } {
     foreach env_var $set_target_env_var {
 	set var [lindex $env_var 0]
 	set value [lindex $env_var 1]
-	if [info exists env($var)] {
-	    lappend saved_target_env_var [list $var 1 $env($var)]
+	if [info exists ::env($var)] {
+	    lappend saved_target_env_var [list $var 1 $::env($var)]
 	} else {
 	    lappend saved_target_env_var [list $var 0]
 	}