From: Junio C Hamano Date: Tue, 9 Jul 2019 22:25:44 +0000 (-0700) Subject: Merge branch 'ab/fail-prereqs-in-test' X-Git-Tag: v2.23.0-rc0~63 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6af2c75d6b371c7ef16e82a2b9c81950fe044191?hp=f496b064fc1135e0dded7f93d85d72eb0b302c22 Merge branch 'ab/fail-prereqs-in-test' Test updates. * ab/fail-prereqs-in-test: tests: mark two failing tests under FAIL_PREREQS --- diff --git a/t/t0007-git-var.sh b/t/t0007-git-var.sh index 5868a87352..1f600e2cae 100755 --- a/t/t0007-git-var.sh +++ b/t/t0007-git-var.sh @@ -17,7 +17,7 @@ test_expect_success 'get GIT_COMMITTER_IDENT' ' test_cmp expect actual ' -test_expect_success !AUTOIDENT 'requested identites are strict' ' +test_expect_success !FAIL_PREREQS,!AUTOIDENT 'requested identites are strict' ' ( sane_unset GIT_COMMITTER_NAME && sane_unset GIT_COMMITTER_EMAIL && diff --git a/t/t7502-commit-porcelain.sh b/t/t7502-commit-porcelain.sh index 5733d9cd34..14c92e4c25 100755 --- a/t/t7502-commit-porcelain.sh +++ b/t/t7502-commit-porcelain.sh @@ -402,7 +402,7 @@ echo editor started >"$(pwd)/.git/result" exit 0 EOF -test_expect_success !AUTOIDENT 'do not fire editor when committer is bogus' ' +test_expect_success !FAIL_PREREQS,!AUTOIDENT 'do not fire editor when committer is bogus' ' >.git/result && echo >>negative &&