From patchwork Fri Oct 10 07:13:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: max X-Patchwork-Id: 398473 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 D8FF01400BE for ; Fri, 10 Oct 2014 18:13:26 +1100 (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=Op2ADsCCOKXfa4Bwz KWSMGgw3/1Rp380UCiCLzvl8c7PnfA70vXu/iRRXChJJCIw2vFUxbJkLJoByPoiG 6g7Vi6BO8g3xL7nXYEg3RN7TL5YkwT08QU5pGmdUHcpj8/2OZTFitRvAg3KxSk+P EwHrB1x0nKBnonYi3S3iOaw8pg= 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=8m5G35/2URABT/dYT4dp1sh HvaM=; b=ZhPtn5TZPkEuthSQYVFrtN+XZQmo1UQyCrG+ukVYPJKRCEVxqapYEP5 EofkM8SJ5PhZ+d6mgjv8rRnPdm0onxqMKD29tXWIv1qvlobksMMAWOD7sMqkFB45 gKT9FYssbx5Zy2xBTrZqKjreApWG/hEUfms4JPAyL85BlUyC5s6E= Received: (qmail 24376 invoked by alias); 10 Oct 2014 07:13:19 -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 24364 invoked by uid 89); 10 Oct 2014 07:13:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 X-HELO: mailout1.w1.samsung.com Received: from mailout1.w1.samsung.com (HELO mailout1.w1.samsung.com) (210.118.77.11) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (DES-CBC3-SHA encrypted) ESMTPS; Fri, 10 Oct 2014 07:13:17 +0000 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0ND7000ZBW6UFN40@mailout1.w1.samsung.com> for gcc-patches@gcc.gnu.org; Fri, 10 Oct 2014 08:16:06 +0100 (BST) Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id C9.1D.15956.80787345; Fri, 10 Oct 2014 08:13:12 +0100 (BST) Received: from [106.109.128.198] by eusync1.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0ND700G41W1ZW260@eusync1.samsung.com>; Fri, 10 Oct 2014 08:13:12 +0100 (BST) Message-id: <54378707.3020407@partner.samsung.com> Date: Fri, 10 Oct 2014 11:13:11 +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: Marcus Shawcroft , Jiong Wang , Yury Gribov , Slava Garbuzov , Maxim Ostapenko , Jakub Jelinek Subject: Re: [PATCH] Fix GCC tests fail for installed toolchain due to ASan, UBSan and TSan testsuites drop GCC_EXEC_PREFIX. References: <543680EA.6070500@partner.samsung.com> In-reply-to: <543680EA.6070500@partner.samsung.com> Content-type: multipart/mixed; boundary=------------020707000009060304080102 X-IsSubscribed: yes Adding Jakub. -Maxim On 10/09/2014 04:34 PM, Maxim Ostapenko wrote: > Hi, > > After enabling ASan, TSan and UBSan testsuites for installed > toolchain, many tests started to fail. This is caused by wrong logic > in {asan, ubsan, tsan}_finish > functions. Here, restore_ld_library_path is called, that is wrong, > because it drops some env variables ( GCC_EXEC_PREFIX, > LD_LIBRARY_PATH, etc) to state that was before gcc-dg.exp initialized > testing environment, so installed GCC will be confused to find some > needed stuff later. > > Removing restore_ld_library_path from {asan, ubsan, tsan}_finish seems > to fix the issue. > > Tested on x86_64-pc-linux-gnu, ok to commit? > > -Maxim gcc/testsuite/ChangeLog: 2014-10-09 Max Ostapenko * lib/asan-dg.exp (asan_finish): Remove restore_ld_library_path_env_vars. * lib/tsan-dg.exp (tsan_finish): Likewise. * lib/ubsan-dg.exp (ubsan_finish): Likewise. diff --git a/gcc/testsuite/lib/asan-dg.exp b/gcc/testsuite/lib/asan-dg.exp index 9769138..c98fd3c 100644 --- a/gcc/testsuite/lib/asan-dg.exp +++ b/gcc/testsuite/lib/asan-dg.exp @@ -132,7 +132,6 @@ proc asan_finish { args } { unset TEST_ALWAYS_FLAGS } } - restore_ld_library_path_env_vars } # Symbolize lines like diff --git a/gcc/testsuite/lib/tsan-dg.exp b/gcc/testsuite/lib/tsan-dg.exp index 54ec404..6f7a4d9 100644 --- a/gcc/testsuite/lib/tsan-dg.exp +++ b/gcc/testsuite/lib/tsan-dg.exp @@ -143,5 +143,4 @@ proc tsan_finish { args } { } else { unset dg-do-what-default } - restore_ld_library_path_env_vars } diff --git a/gcc/testsuite/lib/ubsan-dg.exp b/gcc/testsuite/lib/ubsan-dg.exp index 5a7a653..87c460f 100644 --- a/gcc/testsuite/lib/ubsan-dg.exp +++ b/gcc/testsuite/lib/ubsan-dg.exp @@ -114,5 +114,4 @@ proc ubsan_finish { args } { unset TEST_ALWAYS_FLAGS } } - restore_ld_library_path_env_vars }