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 5868a87352adf69a2e6faa768cb5f9ebfe6f824f..1f600e2cae544b598823a2fd3854493fc8e828c9 100755 (executable)
--- 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 5733d9cd3462a2448b3bb748e62dfe8452f9a733..14c92e4c25c254e1037033b32e2c38afe90e811b 100755 (executable)
--- 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 &&