The setup of our test environment is split up across "ci/lib.sh" and
"ci/run-build-and-tests.sh". It is not exactly obvious why that split
even exists, and because of the split you have to know about both of the
locations to be able to figure out the specific environment that applies
to a specific job.
Consolidate the setup into "ci/lib.sh". Note that this is a pure move
for now that results in some awkward duplication. This duplication will
be cleaned up in subsequent commits.
Signed-off-by: Patrick Steinhardt <redacted>
---
ci/lib.sh | 43 +++++++++++++++++++++++++++++++++++++++++++
ci/run-build-and-tests.sh | 44 --------------------------------------------
2 files changed, 43 insertions(+), 44 deletions(-)
diff --git a/ci/lib.sh b/ci/lib.sh
index 2e63d652543..d0bd8113d35 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -394,7 +394,50 @@ osx-meson)
;;
esac
+case "$jobname" in
+linux-musl-meson)
+ MESONFLAGS="$MESONFLAGS -Drust=disabled"
+ export GIT_TEST_USE_SET_E=yes
+ ;;
+almalinux-*|debian-*|fedora-*|linux-*)
+ export GIT_TEST_USE_SET_E=yes
+ ;;
+esac
+
+case "$jobname" in
+fedora-breaking-changes-meson|linux-breaking-changes)
+ export WITH_BREAKING_CHANGES=YesPlease
+ MESONFLAGS="$MESONFLAGS -Dbreaking_changes=true"
+ ;;
+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-sha256)
+ export GIT_TEST_DEFAULT_HASH=sha256
+ ;;
+linux-reftable-sha256)
+ export GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable
+ export GIT_TEST_DEFAULT_HASH=sha256
+ ;;
+linux-reftable-leaks|osx-reftable)
+ export GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable
+ ;;
+esac
+
MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
+export TEST_CONTRIB_TOO=yes
end_group "CI setup via $(basename $0)"
set -xdiff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index 68b91e31439..b81d654b561 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -5,50 +5,6 @@
. ${0%/*}/lib.sh
-export TEST_CONTRIB_TOO=yes
-
-case "$jobname" in
-linux-musl-meson)
- MESONFLAGS="$MESONFLAGS -Drust=disabled"
- export GIT_TEST_USE_SET_E=yes
- ;;
-almalinux-*|debian-*|fedora-*|linux-*)
- export GIT_TEST_USE_SET_E=yes
- ;;
-esac
-
-case "$jobname" in
-fedora-breaking-changes-meson|linux-breaking-changes)
- export WITH_BREAKING_CHANGES=YesPlease
- MESONFLAGS="$MESONFLAGS -Dbreaking_changes=true"
- ;;
-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-sha256)
- export GIT_TEST_DEFAULT_HASH=sha256
- ;;
-linux-reftable-sha256)
- export GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable
- export GIT_TEST_DEFAULT_HASH=sha256
- ;;
-linux-reftable-leaks|osx-reftable)
- export GIT_TEST_DEFAULT_REF_STORAGE_FORMAT=reftable
- ;;
-esac
-
case "$jobname" in
*-meson)
group "Configure" meson setup build . \
--
2.56.0.500.g5d06dc02cd.dirty