From patchwork Fri Oct 30 16:14:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 1391143 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 4CN6p02wrFz9sSG for ; Sat, 31 Oct 2020 03:14:30 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CDD7C3857020; Fri, 30 Oct 2020 16:14:26 +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 332593857C7B for ; Fri, 30 Oct 2020 16:14:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 332593857C7B 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: 7m23F/ZUvf9a0ObJUvLqQ/8kVfMHSrxOzRNX4WE/Avs1HN9arHc848plTIofGXrCqjmRVbOZrS E5qxz7o1oLTaKLLBsrliR80gnjXWgddn6OIu52YATpRtUMQZlYB2854mSkoAgkFmfySMbb4Hug X3oEcJT5oTN2fHH7FnkSBDFtPEsUVBwLEavXouSQW2LxxVbtTmiWSkANuXyZCA1ErQXArpU4XX LwlMRwJo/pLvsb+TxJ6qs69k/Kzi1U4S1qwU5SiiJ4nJyOXx1kvx0MEoRwgYOJNZecEcR6o+Vl 2Qc= X-IronPort-AV: E=Sophos;i="5.77,433,1596528000"; d="diff'?scan'208";a="54522497" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 30 Oct 2020 08:14:23 -0800 IronPort-SDR: Ugk0sGwpQ68AFzzihVkEEx3iAyiMzsEsTNsdx7pEAb3ui8G66S6FIf+PCOjRPsQBtKk7s7FO4d XyDlsx+FrT7R+E1g4GcyNGw+z3Q93JbY3VzS+NnaivoZM2vj9vgY1t6JD01BszJmVmsmXj4iiQ R7NALXymmfK4xMwZCfYJU2uvF5X1G7MQR/WIDw5CYwCzXC6yUq7Zzn2MmSadS1jqhCExWDPNux e30dETE2Xs+ku46z1OWMjdsQ6S8eDm/vUQZ74hMLDBoG5N5sfKhcTZHwP9zFVbZ7W4t8Zxye4I BUM= Subject: =?utf-8?q?=5BPatch=2C_committed=5D_=E2=80=93_was=3A_=5BPatch=5D_tes?= =?utf-8?q?tsuite=3A_Avoid_TCL_errors_when_rootme_or_ASAN/TSAN/UBSAN_is_not_?= =?utf-8?q?available?= From: Tobias Burnus To: gcc-patches , Rainer Orth , Mike Stump References: Message-ID: Date: Fri, 30 Oct 2020 17:14:16 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: 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" I have now committed it as obvious. Tobias On 19.10.20 18:03, Tobias Burnus wrote: [...] > On 10/19/20 11:46 AM, Tobias Burnus wrote: >> In a --disable-libsanitizer build, I see errors such as: >> g++.sum:ERROR: can't read "asan_saved_library_path": no such >> variable [...] ----------------- Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter commit 24d762d1435257a8efd242c4a1a476c9b2037c03 Author: Tobias Burnus Date: Fri Oct 30 17:11:20 2020 +0100 testsuite: Avoid TCL errors when rootme or ASAN/TSAN/UBSAN is not avail gcc/testsuite/ * g++.dg/guality/guality.exp: Skip $rootme-based check if unset. * gcc.dg/guality/guality.exp: Likewise. * gfortran.dg/guality/guality.exp: Likewise. * lib/asan-dg.exp: Don't use $asan_saved_library_path if not set. * lib/tsan-dg.exp: Don't use $tsan_saved_library_path if not set. * lib/ubsan-dg.exp: Don't use $ubsan_saved_library_path if not set. --- gcc/testsuite/g++.dg/guality/guality.exp | 2 +- gcc/testsuite/gcc.dg/guality/guality.exp | 2 +- gcc/testsuite/gfortran.dg/guality/guality.exp | 2 +- gcc/testsuite/lib/asan-dg.exp | 6 ++++-- gcc/testsuite/lib/tsan-dg.exp | 6 ++++-- gcc/testsuite/lib/ubsan-dg.exp | 6 ++++-- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/gcc/testsuite/g++.dg/guality/guality.exp b/gcc/testsuite/g++.dg/guality/guality.exp index 33571f1f28f..1d5b65fef57 100644 --- a/gcc/testsuite/g++.dg/guality/guality.exp +++ b/gcc/testsuite/g++.dg/guality/guality.exp @@ -41 +41 @@ if ![info exists ::env(GUALITY_GDB_NAME)] { - } elseif [file exists $rootme/../gdb/gdb] { + } elseif { [info exists rootme] && [file exists $rootme/../gdb/gdb] } { diff --git a/gcc/testsuite/gcc.dg/guality/guality.exp b/gcc/testsuite/gcc.dg/guality/guality.exp index 89cd896d05c..ba87132aef2 100644 --- a/gcc/testsuite/gcc.dg/guality/guality.exp +++ b/gcc/testsuite/gcc.dg/guality/guality.exp @@ -41 +41 @@ if ![info exists ::env(GUALITY_GDB_NAME)] { - } elseif [file exists $rootme/../gdb/gdb] { + } elseif { [info exists rootme] && [file exists $rootme/../gdb/gdb] } { diff --git a/gcc/testsuite/gfortran.dg/guality/guality.exp b/gcc/testsuite/gfortran.dg/guality/guality.exp index eaa7ae770d6..0375edfffe4 100644 --- a/gcc/testsuite/gfortran.dg/guality/guality.exp +++ b/gcc/testsuite/gfortran.dg/guality/guality.exp @@ -22 +22 @@ if ![info exists ::env(GUALITY_GDB_NAME)] { - } elseif [file exists $rootme/../gdb/gdb] { + } elseif { [info exists rootme] && [file exists $rootme/../gdb/gdb] } { 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 @@ -154,2 +154,4 @@ proc asan_finish { args } { - 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 + } 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 @@ -153,2 +153,4 @@ proc tsan_finish { args } { - 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 + } 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 @@ -144,2 +144,4 @@ proc ubsan_finish { args } { - 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 + }