From: Patrick Steinhardt Date: Tue, 27 Oct 2026 08:18:24 GMT Subject: [PATCH 4/8] ci/lib: merge switches for specific job names Message-ID: <20261027-b4-pks-ci-test-vars-consolidation-v1-4-f28edf79bd6c@pks.im> In-Reply-To: <20261027-b4-pks-ci-test-vars-consolidation-v1-0-f28edf79bd6c@pks.im> With the preceding consolidations of test variables we now pointlessly have three switches over "$jobname". Merge them into a single switch. Signed-off-by: Patrick Steinhardt --- ci/lib.sh | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/ci/lib.sh b/ci/lib.sh index de4b94d4d33..7f67a95cdcc 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -396,11 +396,26 @@ case "$jobname" in linux32) CC=gcc ;; +linux-feature-testbed) + export OPENSSL_SHA1_UNSAFE=YesPlease + export GIT_TEST_SPLIT_INDEX=yes + export GIT_TEST_FULL_IN_PACK_ARRAY=true + export GIT_TEST_OE_SIZE=10 + export GIT_TEST_OE_DELTA_SIZE=5 + export GIT_TEST_COMMIT_GRAPH=1 + export GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1 + export GIT_TEST_MULTI_PACK_INDEX=1 + export GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=1 + export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master + export GIT_TEST_NO_WRITE_REV_INDEX=1 + export GIT_TEST_CHECKOUT_WORKERS=2 + export GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1 + ;; linux-meson) MESONFLAGS="$MESONFLAGS -Dcredential_helpers=libsecret,netrc" ;; linux-musl-meson) - MESONFLAGS="$MESONFLAGS -Dtest_utf8_locale=C.UTF-8" + MESONFLAGS="$MESONFLAGS -Dtest_utf8_locale=C.UTF-8 -Drust=disabled" ;; linux-leaks|linux-reftable-leaks) export SANITIZE=leak @@ -419,30 +434,6 @@ osx-meson) ;; esac -case "$jobname" in -linux-musl-meson) - MESONFLAGS="$MESONFLAGS -Drust=disabled" - ;; -esac - -case "$jobname" in -linux-feature-testbed) - export OPENSSL_SHA1_UNSAFE=YesPlease - export GIT_TEST_SPLIT_INDEX=yes - export GIT_TEST_FULL_IN_PACK_ARRAY=true - export GIT_TEST_OE_SIZE=10 - export GIT_TEST_OE_DELTA_SIZE=5 - export GIT_TEST_COMMIT_GRAPH=1 - export GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1 - export GIT_TEST_MULTI_PACK_INDEX=1 - export GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=1 - export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master - export GIT_TEST_NO_WRITE_REV_INDEX=1 - export GIT_TEST_CHECKOUT_WORKERS=2 - export GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1 - ;; -esac - MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}" export TEST_CONTRIB_TOO=yes -- 2.56.0.341.g393f52fd96.dirty