From patchwork Fri Dec 20 20:04:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schimpe, Christina" X-Patchwork-Id: 103527 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1D7343858C51 for ; Fri, 20 Dec 2024 20:11:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1D7343858C51 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=XPrmwq81 X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by sourceware.org (Postfix) with ESMTPS id A5A653858C35 for ; Fri, 20 Dec 2024 20:05:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A5A653858C35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A5A653858C35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=198.175.65.21 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734725135; cv=none; b=F6u4dFEpoeFCo0khiuXX0fIv4ajYHanFxKVTD11HgyhvOGoh4LkhTCZQTfEMgpBGNqEln1v87Hzn8xJRZd7ZWCXpiVzamXBBvjGhWmV+DGE9toXf6d2kRnbdpy5Liopog+N5/j7EwQLSmQPo/AHpkKodMWA1acKSdmXrTM6qT5M= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734725135; c=relaxed/simple; bh=HzSJBWLhySogPtKHHz4CKeB9mqOcNB3oyGLrFkb/gj0=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=X71x2AW3po1Vy0rXwOy0jXN5v93sTUjG9DPMBnU+mtBiIzAlNVQrhMSdIqsBvI6l0EO2TZOvylZkIYOB/8kDUXHxxuSTcMCfbe2G+pSNMsCgV1woAPm758Jt52CfAt32nVIY0EOp+QIK+mH4Yd3SOarpCr/39mm8zI9a7oQrce4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A5A653858C35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1734725136; x=1766261136; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=HzSJBWLhySogPtKHHz4CKeB9mqOcNB3oyGLrFkb/gj0=; b=XPrmwq81+qjFCw5au6D5FPlKbp+jxbGQmMSYih7P294D3Ep3WYctoAq1 TN9tZn5GtES0K2exS0Y4SPOHw1k8E5X+qxFTt9kpql3mGRPSNsB5jbf/C iRDU18o8b/aC58q51qG5ddE9T/+qMXcTltVcKf9wMdbAbS8sqaygZ5X+X q4G9C11AWEEXRo1LsaxsWz6dfXxsN9NUpG5atjPPE7I3EoUwQYQWMJ+Qr bdCl8q/NotxaRBSx1OhSJaGmkEM2X3wo+E7BFzlMLZ/McLm+eGBSyEtM1 Fh60KQnomxVN5aVTianKEVvTM640jr/C7O4Hy8poRFflya7+LWp3LuhMj w==; X-CSE-ConnectionGUID: 2FYHle4kQJOFJYcXq23NqQ== X-CSE-MsgGUID: kA2xIQCwR+eqiaE+r0TNLA== X-IronPort-AV: E=McAfee;i="6700,10204,11292"; a="35174263" X-IronPort-AV: E=Sophos;i="6.12,251,1728975600"; d="scan'208";a="35174263" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Dec 2024 12:05:36 -0800 X-CSE-ConnectionGUID: AoTVJNjFQlymIQASUjknRQ== X-CSE-MsgGUID: l50oUuX5RaWK4DIIpeZ7yw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="121877515" Received: from gkldtt-dev-004.igk.intel.com (HELO localhost) ([10.123.221.202]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Dec 2024 12:05:34 -0800 From: "Schimpe, Christina" To: gdb-patches@sourceware.org Subject: [PATCH 01/12] gdb, testsuite: Rename set_sanitizer_default to append_environment. Date: Fri, 20 Dec 2024 20:04:50 +0000 Message-Id: <20241220200501.324191-2-christina.schimpe@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241220200501.324191-1-christina.schimpe@intel.com> References: <20241220200501.324191-1-christina.schimpe@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org The procedure set_sanitizer_default has been used for the configuration of ASAN specific environment variables. However, it is actually a generic function. Rename it to append_environment so that its purpose is more clear. --- gdb/testsuite/gdb.base/libsegfault.exp | 2 +- gdb/testsuite/gdb.threads/attach-slow-waitpid.exp | 2 +- gdb/testsuite/lib/gdb.exp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/gdb.base/libsegfault.exp b/gdb/testsuite/gdb.base/libsegfault.exp index 2c16fe8932a..fb62bdb8746 100644 --- a/gdb/testsuite/gdb.base/libsegfault.exp +++ b/gdb/testsuite/gdb.base/libsegfault.exp @@ -42,7 +42,7 @@ proc gdb_spawn_with_ld_preload {lib cmdline_opts} { # ASan runtime does not come first in initial library list; you should # either link runtime to your application or manually preload it with # LD_PRELOAD. - set_sanitizer_default ASAN_OPTIONS verify_asan_link_order 0 + append_environment ASAN_OPTIONS verify_asan_link_order 0 gdb_spawn_with_cmdline_opts $cmdline_opts } diff --git a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp b/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp index 28d70daad8c..abe8d434558 100644 --- a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp +++ b/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp @@ -83,7 +83,7 @@ proc gdb_spawn_with_ld_preload {lib} { # ASan runtime does not come first in initial library list; you should # either link runtime to your application or manually preload it with # LD_PRELOAD. - set_sanitizer_default ASAN_OPTIONS verify_asan_link_order 0 + append_environment ASAN_OPTIONS verify_asan_link_order 0 gdb_start } diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 7ee2043f0f8..a86f534528c 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -76,11 +76,11 @@ proc set_sanitizer { env_var var_id val } { # Add VAR_ID=VAL to ENV_VAR, unless ENV_VAR already contains a VAR_ID setting. -proc set_sanitizer_default { env_var var_id val } { +proc append_environment { env_var var_id val } { set_sanitizer_1 $env_var $var_id $val 1 } -set_sanitizer_default TSAN_OPTIONS suppressions \ +append_environment TSAN_OPTIONS suppressions \ $srcdir/../tsan-suppressions.txt # When using ThreadSanitizer we may run into the case that a race is detected, @@ -89,14 +89,14 @@ set_sanitizer_default TSAN_OPTIONS suppressions \ # Try to prevent this by setting history_size to the maximum (7) by default. # See also the ThreadSanitizer docs ( # https://github.com/google/sanitizers/wiki/ThreadSanitizerFlags ). -set_sanitizer_default TSAN_OPTIONS history_size 7 +append_environment TSAN_OPTIONS history_size 7 # If GDB is built with ASAN (and because there are leaks), it will output a # leak report when exiting as well as exit with a non-zero (failure) status. # This can affect tests that are sensitive to what GDB prints on stderr or its # exit status. Add `detect_leaks=0` to the ASAN_OPTIONS environment variable # (which will affect any spawned sub-process) to avoid this. -set_sanitizer_default ASAN_OPTIONS detect_leaks 0 +append_environment ASAN_OPTIONS detect_leaks 0 # List of procs to run in gdb_finish. set gdb_finish_hooks [list]