diff mbox series

[v6,26/29] CI: set SANITIZE=leak in MAKEFLAGS directly

Message ID	patch-v6-26.29-98e320d5e67-20220525T094123Z-avarab@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= <avarab@gmail.com> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, Taylor Blau <me@ttaylorr.com>, =?utf-8?q?SZEDER_G=C3=A1bor?= <szeder.dev@gmail.com>, =?utf-8?b?xJBvw6Bu?= =?utf-8?b?IFRy4bqnbiBDw7RuZyBEYW5o?= <congdanhqx@gmail.com>, =?utf-8?q?Car?= =?utf-8?q?lo_Marcelo_Arenas_Bel=C3=B3n?= <carenas@gmail.com>, Johannes Schindelin <Johannes.Schindelin@gmx.de>, Victoria Dye <vdye@github.com>, Matheus Tavares <matheus.bernardino@usp.br>, Lars Schneider <larsxschneider@gmail.com>, Eric Sunshine <sunshine@sunshineco.com>, =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= <avarab@gmail.com> Subject: [PATCH v6 26/29] CI: set SANITIZE=leak in MAKEFLAGS directly Date: Wed, 25 May 2022 12:04:05 +0200 Message-Id: <patch-v6-26.29-98e320d5e67-20220525T094123Z-avarab@gmail.com> In-Reply-To: <cover-v6-00.29-00000000000-20220525T094123Z-avarab@gmail.com> References: <cover-v5-00.29-00000000000-20220421T181526Z-avarab@gmail.com> <cover-v6-00.29-00000000000-20220525T094123Z-avarab@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	CI: run "make" in CI "steps", improve UX \| expand [v6,00/29] CI: run "make" in CI "steps", improve UX [v6,01/29] CI: run "set -ex" early in ci/lib.sh [v6,02/29] CI: make "$jobname" explicit, remove fallback [v6,03/29] CI: remove more dead Travis CI support [v6,04/29] CI: remove dead "tree skipping" code [v6,05/29] CI: remove unused Azure ci/* code [v6,06/29] CI/lib.sh: stop adding leading whitespace to $MAKEFLAGS [v6,07/29] CI: don't have "git grep" invoke a pager in tree content check [v6,08/29] CI: have "static-analysis" run a "make ci-static-analysis" target [v6,09/29] CI: have "static-analysis" run "check-builtins", not "documentation" [v6,10/29] CI: move p4 and git-lfs variables to ci/install-dependencies.sh [v6,11/29] CI: consistently use "export" in ci/lib.sh [v6,12/29] CI: export variables via a wrapper [v6,13/29] CI: remove "run-build-and-tests.sh", run "make [test]" directly [v6,14/29] CI: make ci/{lib,install-dependencies}.sh POSIX-compatible [v6,15/29] CI: check ignored unignored build artifacts in "win[+VS] build" too [v6,16/29] CI: invoke "make artifacts-tar" directly in windows-build [v6,17/29] CI: split up and reduce "ci/test-documentation.sh" [v6,18/29] CI: combine ci/install{,-docker}-dependencies.sh [v6,19/29] CI: move "env" definitions into ci/lib.sh [v6,20/29] ci/run-test-slice.sh: replace shelling out with "echo" [v6,21/29] CI: pre-select test slice in Windows & VS tests [v6,22/29] CI: only invoke ci/lib.sh as "steps" in main.yml [v6,23/29] CI: narrow down variable definitions in --build and --test [v6,24/29] CI: add more variables to MAKEFLAGS, except under vs-build [v6,25/29] CI: set CC in MAKEFLAGS directly, don't add it to the environment [v6,26/29] CI: set SANITIZE=leak in MAKEFLAGS directly [v6,27/29] CI: set PYTHON_PATH setting for osx-{clang,gcc} into "$jobname" case [v6,28/29] CI: don't use "set -x" in "ci/lib.sh" output [v6,29/29] CI: make it easy to use ci/*.sh outside of CI

Commit Message

Ævar Arnfjörð Bjarmason May 25, 2022, 10:04 a.m. UTC

As in the preceding commit's change to do likewise for CC, let's not
set SANITIZE in the environment. When I added the "linux-leaks" job in
in 956d2e4639b (tests: add a test mode for SANITIZE=leak, run it in
CI, 2021-09-23) I missed that I could do that.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 ci/lib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/ci/lib.sh b/ci/lib.sh
index 8d19ca5ced8..b6e7a6647bb 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -225,7 +225,7 @@  linux-musl)
 	;;
 linux-leaks)
 	CC=gcc
-	setenv --build SANITIZE leak
+	MAKEFLAGS="$MAKEFLAGS SANITIZE=leak"
 	setenv --test GIT_TEST_PASSING_SANITIZE_LEAK true
 	;;
 esac