From patchwork Mon Sep 1 09:09:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: max X-Patchwork-Id: 384722 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B581314019C for ; Mon, 1 Sep 2014 19:09:29 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; q=dns; s=default; b=HWZcV3Mc3JLKo8Mk7 8CKgmmQnDBj1wA/5F0yPliGqj/JvCuTCNUynvag3+HfZWcS7NjMJq6kbDcaSza08 B2KjOzuaXFf67jLCfYKL4LGkrFVzv3e5RxOD8JmXPw51Tq7RO1p2LBWuOKR2JRC0 PV95mqI6DPMKiJnoQrreIjTTQ4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; s=default; bh=3xgapeFI0Z4oDmaNgiReVFz a/vw=; b=GryTQvzmQsJrzYFvtGCsf57zhlCV2ouyHTkoE8iunxhS6bhJokDoAI9 0rj/vlpnT3qxobdQ0FHH09C6shcHdwQkhsY/+f2Wc0ng+6CbkTqj4yL4vHT/Hblc CePNOTeojSW9G3rKmqsVMU21y/JJcqbpplPQUln24oIDW84+66hY= Received: (qmail 1478 invoked by alias); 1 Sep 2014 09:09:11 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 1405 invoked by uid 89); 1 Sep 2014 09:09:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.1 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 X-HELO: mailout4.w1.samsung.com Received: from mailout4.w1.samsung.com (HELO mailout4.w1.samsung.com) (210.118.77.14) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (DES-CBC3-SHA encrypted) ESMTPS; Mon, 01 Sep 2014 09:09:09 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NB70084PTJUC720@mailout4.w1.samsung.com> for gcc-patches@gcc.gnu.org; Mon, 01 Sep 2014 10:11:54 +0100 (BST) Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 3F.B2.25543.1B734045; Mon, 01 Sep 2014 10:09:05 +0100 (BST) Received: from [106.109.130.31] by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0NB7000STTF3F360@eusync3.samsung.com>; Mon, 01 Sep 2014 10:09:05 +0100 (BST) Message-id: <540437AF.8050503@partner.samsung.com> Date: Mon, 01 Sep 2014 13:09:03 +0400 From: Maxim Ostapenko User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-version: 1.0 To: GCC Patches Cc: Yury Gribov , Slava Garbuzov Subject: [PING][PATCH] Fix environment variables restoring in GCC testsuite. References: <53F71DD4.1040404@partner.samsung.com> In-reply-to: <53F71DD4.1040404@partner.samsung.com> X-Forwarded-Message-Id: <53F71DD4.1040404@partner.samsung.com> Content-type: multipart/mixed; boundary=------------000300080003030500000400 X-IsSubscribed: yes Ping. -Maxim -------- Original Message -------- Subject: [PATCH] Fix environment variables restoring in GCC testsuite. Date: Fri, 22 Aug 2014 14:39:16 +0400 From: Maxim Ostapenko To: GCC Patches CC: Yury Gribov , Slava Garbuzov 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 gcc/testsuite/ChangeLog: 2014-09-01 Max Ostapenko * 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] }