Git development
 help / color / mirror / Atom feed
From: Phillip Wood <phillip.wood123@gmail.com>
To: Patrick Steinhardt <ps@pks.im>, git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
	Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
Subject: Re: [PATCH 8/8] t/test-lib: make feature-testbed job more accessible
Date: Tue, 27 Oct 2026 14:53:07 +0000	[thread overview]
Message-ID: <1da30fde-75bf-469f-80e1-ce90cd29c84d@gmail.com> (raw)
In-Reply-To: <20261027-b4-pks-ci-test-vars-consolidation-v1-8-f28edf79bd6c@pks.im>

Hi Patrick

On 27/10/2026 08:18, Patrick Steinhardt wrote:
> Our "feature-testbed" job sets up a bunch of GIT_TEST environment
> variables and then executes our tests. This is mostly intended as a
> testbed for features that aren't default-enabled, but that may
> eventually become so.
> 
> Due to the job being special it has a higher potential of failing even
> though a local test run succeeds. But running these tests locally with
> the same environment is somewhat painful, as the developer has to
> manually set all of these environment variables.
> 
> Introduce a new "--feature-testbed" toggle for our test suite that, when
> set, sets up exactly these environment variables. Migrate our CI to use
> this toggle so that we have a single source of truth, only.
> 
> Note that we only set these GIT_TEST variables in the case where they
> haven't already been configured. This serves two purposes:
> 
>    - The user can continue to manually override a subset of those
>      variables, if they desire.
> 
>    - Test scripts typically source "t/test-lib.sh" after they already
>      overrode GIT_TEST variables, and we don't want to discard that.

That all sounds sensible, the commit message could maybe flag that the 
"feature-testbed" also sets OPENSSL_SHA1_UNSAFE which 
"--feature-testbed" does not because it is only concerned with GIT_TEST_*.

> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index de566309861..8863bcac930 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -202,6 +202,14 @@ finalize_test_case_output () { :; }
>   finalize_test_leak_output () { :; }
>   finalize_test_output () { :; }
>   
> +set_default_env () {
> +	if eval "test -z \"\${$1+set}\""

This made me scratch my head for a couple of minutes, but I think it is 
correct

	set_default_env ABC 1

evaluates

	test -z "${ABC+set}"

to see if $ABC is unset.

Thanks

Phillip
> +	then
> +		eval "$1=\$2"
> +	fi
> +	export "$1"
> +}
> +
>   parse_option () {
>   	local opt="$1"
>   
> @@ -212,6 +220,19 @@ parse_option () {
>   		immediate=t ;;
>   	-l|--l|--lo|--lon|--long|--long-|--long-t|--long-te|--long-tes|--long-test|--long-tests)
>   		GIT_TEST_LONG=true; export GIT_TEST_LONG ;;
> +	--feature-testbed)
> +		set_default_env GIT_TEST_SPLIT_INDEX yes
> +		set_default_env GIT_TEST_FULL_IN_PACK_ARRAY true
> +		set_default_env GIT_TEST_OE_SIZE 10
> +		set_default_env GIT_TEST_OE_DELTA_SIZE 5
> +		set_default_env GIT_TEST_COMMIT_GRAPH 1
> +		set_default_env GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS 1
> +		set_default_env GIT_TEST_MULTI_PACK_INDEX 1
> +		set_default_env GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL 1
> +		set_default_env GIT_TEST_NO_WRITE_REV_INDEX 1
> +		set_default_env GIT_TEST_CHECKOUT_WORKERS 2
> +		set_default_env GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL 1
> +		;;
>   	-r)
>   		mark_option_requires_arg "$opt" run_list
>   		;;
> diff --git a/t/unit-tests/unit-test.c b/t/unit-tests/unit-test.c
> index 752fb38fb32..f4898353045 100644
> --- a/t/unit-tests/unit-test.c
> +++ b/t/unit-tests/unit-test.c
> @@ -27,6 +27,7 @@ int cmd_main(int argc, const char **argv)
>   		 * options understood by integration tests.
>   		 */
>   		OPT_NOOP_NOARG('d', "debug"),
> +		OPT_NOOP_NOARG(0, "feature-testbed"),
>   		OPT_NOOP_NOARG(0, "github-workflow-markup"),
>   		OPT_NOOP_NOARG(0, "no-bin-wrappers"),
>   		OPT_NOOP_ARG(0, "no-chain-lint"),
> 


  reply	other threads:[~2026-10-27 14:53 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-27  8:18 [PATCH 0/8] ci: consolidate test variables Patrick Steinhardt
2026-10-27  8:18 ` [PATCH 1/8] ci: consolidate setup of test environment Patrick Steinhardt
2026-10-27  8:18 ` [PATCH 2/8] ci/lib: always set GIT_TEST_USE_SET_E on Linux jobs Patrick Steinhardt
2026-10-27  8:18 ` [PATCH 3/8] ci/lib: deduplicate test variables by pattern matching Patrick Steinhardt
2026-10-27  8:18 ` [PATCH 4/8] ci/lib: merge switches for specific job names Patrick Steinhardt
2026-10-27  8:18 ` [PATCH 5/8] t: honor default ref storage format Patrick Steinhardt
2026-10-27  8:18 ` [PATCH 6/8] ci/lib: add another NO_RUST build using glibc Patrick Steinhardt
2026-10-27  8:18 ` [PATCH 7/8] ci: don't override initial branch name in testbed job Patrick Steinhardt
2026-10-27  8:18 ` [PATCH 8/8] t/test-lib: make feature-testbed job more accessible Patrick Steinhardt
2026-10-27 14:53   ` Phillip Wood [this message]
2026-10-27 20:59     ` Junio C Hamano
2026-10-28  7:41       ` Patrick Steinhardt
2026-10-27 21:23   ` Jeff King
2026-10-27 21:47     ` Junio C Hamano
2026-10-28  7:39     ` Patrick Steinhardt
2026-10-28 14:33     ` Phillip Wood
2026-10-27 15:00 ` [PATCH 0/8] ci: consolidate test variables Phillip Wood
2026-10-27 20:59   ` Junio C Hamano
2026-10-27 21:24 ` Jeff King
2026-10-28 14:40   ` Toon Claes

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1da30fde-75bf-469f-80e1-ce90cd29c84d@gmail.com \
    --to=phillip.wood123@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=kaartic.sivaraam@gmail.com \
    --cc=peff@peff.net \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=ps@pks.im \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox