[PATCH v2] test-lib: try harder to ensure a working jgit
- From
Todd Zullinger <tmz@pobox.com>
- Date
- May 15, 2019, 01:36 UTC
- Message-ID
- <20190515013633.GQ3654@pobox.com>
- In-Reply-To
- <20190514020520.GI3654@pobox.com>
The JGIT prereq uses `type jgit` to determine whether jgit is present. While this is usually sufficient, it won't help if the jgit found is badly broken. This wastes time running tests which fail due to no fault of our own.
Use `jgit --version` instead, to guard against cases where jgit is present on the system, but will fail to run, e.g. because of some JRE issue, or missing Java dependencies. Checking that it gets far enough to process the '--version' argument isn't perfect, but seems to be good enough in practice. It's also consistent with how we detect some other dependencies, see e.g. the CURL and UNZIP prerequisites.
Signed-off-by: Todd Zullinger <tmz@pobox.com> --- As promised, I stole the second paragraph from Ævar nearly verbatim. :)
t/test-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh index 908ddb9c46..599fd70e14 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -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
-- Todd