diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-07-21 16:26:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-21 16:26:13 -0700 |
| commit | 33e5da5b6c231f25aa7de6730ccad0fc1fea5caf (patch) | |
| tree | 29a517ff31606c7af004ab7f43710ed9974d3e38 /t/t0000-basic.sh | |
| parent | b9457af0040e11713b1c6c9d547a005b5997d43f (diff) | |
| parent | ade15525987a2e108fe6b6dd1a2ba4d963d64f13 (diff) | |
| download | git-33e5da5b6c231f25aa7de6730ccad0fc1fea5caf.tar.xz | |
Merge branch 'ps/t0000-output-directory-fix' into ab/lib-subtest
* ps/t0000-output-directory-fix:
t0000: fix test if run with TEST_OUTPUT_DIRECTORY
Diffstat (limited to 't/t0000-basic.sh')
| -rwxr-xr-x | t/t0000-basic.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index f68c27d864..cb87768513 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -106,8 +106,11 @@ _run_sub_test_lib_test_common () { EOF cat >>"$name.sh" && export TEST_DIRECTORY && - TEST_OUTPUT_DIRECTORY=$(pwd) && - export TEST_OUTPUT_DIRECTORY && + # The child test re-sources GIT-BUILD-OPTIONS and may thus + # override the test output directory. We thus pass it as an + # explicit override to the child. + TEST_OUTPUT_DIRECTORY_OVERRIDE=$(pwd) && + export TEST_OUTPUT_DIRECTORY_OVERRIDE && GIT_SKIP_TESTS=$skip && export GIT_SKIP_TESTS && sane_unset GIT_TEST_FAIL_PREREQS && |