[PATCH 8/8] t/test-lib: make feature-testbed job more accessible
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.Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
ci/lib.sh | 12 +-----------
t/README | 5 +++++
t/test-lib.sh | 21 +++++++++++++++++++++
t/unit-tests/unit-test.c | 1 +
4 files changed, 28 insertions(+), 11 deletions(-)
Show changes to 4 files +28 −11
ci/lib.sh, t/README, t/test-lib.sh, t/unit-tests/unit-test.c
diff --git a/ci/lib.sh b/ci/lib.sh
index fbb13ca6c6a..c3a5ec48f22 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -398,17 +398,7 @@ linux32)
;;
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_NO_WRITE_REV_INDEX=1
- export GIT_TEST_CHECKOUT_WORKERS=2
- export GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL=1
+ GIT_TEST_OPTS="$GIT_TEST_OPTS --feature-testbed"
;;
linux-meson)
MESONFLAGS="$MESONFLAGS -Dcredential_helpers=libsecret,netrc"
diff --git a/t/README b/t/README
index fd7e8504b51..211bf78aed9 100644
--- a/t/README
+++ b/t/README
@@ -119,6 +119,11 @@ appropriately before running "make". Short options can be bundled, i.e.
This causes additional long-running tests to be run (where
available), for more exhaustive testing.
+--feature-testbed::
+ This causes tests to run with several `GIT_TEST` environment
+ variables set. The intent is to test Git with optional features
+ and non-default configuration.
+
-r::
--run=<test-selector>::
Run only the subset of tests indicated by
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}\""
+ 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"),
--
2.56.0.341.g393f52fd96.dirty