Browse Source

Merge branch 'ab/fail-prereqs-in-test'

Test updates.

* ab/fail-prereqs-in-test:
  tests: mark two failing tests under FAIL_PREREQS
maint
Junio C Hamano 6 years ago
parent
commit
6af2c75d6b
  1. 2
      t/t0007-git-var.sh
  2. 2
      t/t7502-commit-porcelain.sh

2
t/t0007-git-var.sh

@ -17,7 +17,7 @@ test_expect_success 'get GIT_COMMITTER_IDENT' ' @@ -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 &&

2
t/t7502-commit-porcelain.sh

@ -402,7 +402,7 @@ echo editor started >"$(pwd)/.git/result" @@ -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 &&

Loading…
Cancel
Save