diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2019-05-13 20:32:42 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-05-14 16:48:17 +0900 |
| commit | dfe1a17df9b1bd9ab95095e248b8f376637ac395 (patch) | |
| tree | 49a6439a37a7c0d06efbb3ba5017d0128da15a2c /t/t7405-submodule-merge.sh | |
| parent | Git 2.22-rc0 (diff) | |
| download | tgif-dfe1a17df9b1bd9ab95095e248b8f376637ac395.tar.xz | |
tests: add a special setup where prerequisites fail
As discussed in [1] there's a regression in the "pu" branch now
because a new test implicitly assumed that a previous test guarded by
a prerequisite had been run. Add a "GIT_TEST_FAIL_PREREQS" special
test setup where we'll skip (nearly) all tests guarded by
prerequisites, allowing us to easily emulate those platform where we
don't run these tests.
As noted in the documentation I'm adding I'm whitelisting the SYMLINKS
prerequisite for now. A lot of tests started failing if we lied about
not supporting symlinks. It's also unlikely that we'll have a failing
test due to a hard dependency on symlinks without that being the
obvious cause, so for now it's not worth the effort to make it work.
1. https://public-inbox.org/git/nycvar.QRO.7.76.6.1905131531000.44@tvgsbejvaqbjf.bet/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7405-submodule-merge.sh')
| -rwxr-xr-x | t/t7405-submodule-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh index 7855bd8648..aa33978ed2 100755 --- a/t/t7405-submodule-merge.sh +++ b/t/t7405-submodule-merge.sh @@ -417,7 +417,7 @@ test_expect_failure 'directory/submodule conflict; keep submodule clean' ' ) ' -test_expect_failure 'directory/submodule conflict; should not treat submodule files as untracked or in the way' ' +test_expect_failure !FAIL_PREREQS 'directory/submodule conflict; should not treat submodule files as untracked or in the way' ' test_when_finished "git -C directory-submodule/path reset --hard" && test_when_finished "git -C directory-submodule reset --hard" && ( |