From patchwork Mon Oct 19 09:46:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 1384133 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CFBjW1Nbxz9sT6 for ; Mon, 19 Oct 2020 20:46:37 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EFD173842417; Mon, 19 Oct 2020 09:46:34 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com [68.232.137.180]) by sourceware.org (Postfix) with ESMTPS id 3B7263858020 for ; Mon, 19 Oct 2020 09:46:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3B7263858020 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Tobias_Burnus@mentor.com IronPort-SDR: OLt61FS0gBY8AaxStFvAly7UD9Jaw2+8hpjRn5cUW4+VEhGHdvNS99d4R/krLIKHmrQHjlWg2J kaM6qnsc3NmqERwt1RvJhfOhCKmBXYDdLqI6aovpl9BJF3ZBnUpuTNZ2HVvIbZ9+d21S8Ez9mu US0mTpJXDs46Cj1WM+chyf1J9PC7c79iHuJc8rlL8UGdYwqnNDkpRp8e9uNu7LD9r17OIOp0mh Gg+j+sV+DZT+1tcsiVa1U1FJxkp9RPc0fIXz7sLjbWWXcmRtojYlrH+I+34QkRx3tczHbrIERC 0YY= X-IronPort-AV: E=Sophos;i="5.77,394,1596528000"; d="diff'?scan'208";a="54087537" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 19 Oct 2020 01:46:31 -0800 IronPort-SDR: nnkCdRNuMY/Shugrs2QRiNg0ha+s7ouFDF64/ABE5ct1GG3XAyEBj2UvHi2LC+ZghD87sw7tMP TO9f+O4XLVdCviCGgZhKPro8jlcgWnh1DCMFOawpbUcJq/dV+PbST3QWdGbOHZc0UCdKjeyhSj qNMFAjFhFA07zzr/XmcyOgJGQSoyIYyRyd0TQw0t9qYu4rK6HJYa60vUjHwcWqRlnHbz5I0Fba W+dM21J4gcqz4I0fWmHnR4zXOsnjPSJ7rgHEfTUxm4towVQvLdSiqMqyJc26lIuMCN4rx+oYVu X5w= To: gcc-patches , Rainer Orth , Mike Stump From: Tobias Burnus Subject: [Patch] testsuite: Avoid TCL errors when ASAN/TSAN/UBSAN is not available Message-ID: Date: Mon, 19 Oct 2020 11:46:25 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.3.2 MIME-Version: 1.0 Content-Language: en-US X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-03.mgc.mentorg.com (139.181.222.3) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" In a --disable-libsanitizer build, I see errors such as: g++.sum:ERROR: can't read "asan_saved_library_path": no such variable I believe the following patch is the right way to solve this. OK? Tobias ----------------- Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter testsuite: Avoid TCL errors when ASAN/TSAN/UBSAN is not available gcc/testsuite/ChangeLog: * lib/asan-dg.ex (asan_finish): Only reset ld_library_path if saved-path variable exists. * lib/tsan-dg.exp (tsan_finish): Likewise. * lib/ubsan-dg.ex (ubsan_finish): Likewise. diff --git a/gcc/testsuite/lib/asan-dg.exp b/gcc/testsuite/lib/asan-dg.exp index 2124607245e..ce745dfdf8d 100644 --- a/gcc/testsuite/lib/asan-dg.exp +++ b/gcc/testsuite/lib/asan-dg.exp @@ -151,8 +151,10 @@ proc asan_finish { args } { unset TEST_ALWAYS_FLAGS } } - set ld_library_path $asan_saved_library_path - set_ld_library_path_env_vars + if [info exists asan_saved_library_path ] { + set ld_library_path $asan_saved_library_path + set_ld_library_path_env_vars + } clear_effective_target_cache } diff --git a/gcc/testsuite/lib/tsan-dg.exp b/gcc/testsuite/lib/tsan-dg.exp index b5631a79bcf..6dcfd0a2f83 100644 --- a/gcc/testsuite/lib/tsan-dg.exp +++ b/gcc/testsuite/lib/tsan-dg.exp @@ -150,7 +150,9 @@ proc tsan_finish { args } { } else { unset dg-do-what-default } - set ld_library_path $tsan_saved_library_path - set_ld_library_path_env_vars + if [info exists tsan_saved_library_path ] { + set ld_library_path $tsan_saved_library_path + set_ld_library_path_env_vars + } clear_effective_target_cache } diff --git a/gcc/testsuite/lib/ubsan-dg.exp b/gcc/testsuite/lib/ubsan-dg.exp index f4ab29e2add..31740e02ab4 100644 --- a/gcc/testsuite/lib/ubsan-dg.exp +++ b/gcc/testsuite/lib/ubsan-dg.exp @@ -141,7 +141,9 @@ proc ubsan_finish { args } { unset TEST_ALWAYS_FLAGS } } - set ld_library_path $ubsan_saved_library_path - set_ld_library_path_env_vars + if [info exists ubsan_saved_library_path ] { + set ld_library_path $ubsan_saved_library_path + set_ld_library_path_env_vars + } clear_effective_target_cache }