From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Jun 2019 20:19:41 +0000 (-0700)
Subject: Merge branch 'ab/fail-prereqs-in-test'
X-Git-Tag: v2.23.0-rc0~135
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/89d1b573d73e7c93f2190a08ed9430f42104c10b?hp=-c

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

Developer support to emulate unsatisfied prerequisites in tests to
ensure that the remainer of the tests still succeeds when tests
with prerequisites are skipped.

* ab/fail-prereqs-in-test:
tests: add a special setup where prerequisites fail
---

89d1b573d73e7c93f2190a08ed9430f42104c10b
diff --combined t/test-lib.sh
index 599fd70e14,6fabafebb3..4b346467df
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -1522,7 -1522,7 +1522,7 @@@ test_lazy_prereq NOT_ROOT 
  '
  
  test_lazy_prereq JGIT '
 -	type jgit
 +	jgit --version
  '
  
  # SANITY is about "can you correctly predict what the filesystem would
@@@ -1607,3 -1607,7 +1607,7 @@@ test_lazy_prereq SHA1 
  test_lazy_prereq REBASE_P '
  	test -z "$GIT_TEST_SKIP_REBASE_P"
  '
+ 
+ test_lazy_prereq FAIL_PREREQS '
+ 	test -n "$GIT_TEST_FAIL_PREREQS"
+ '