| Message ID | 20230606214707.55739-1-tmz@pobox.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 78e56cff69df290058ddefe18637de973f91b39d |
| Headers | show |
| Series | t/lib-gpg: require GPGSSH for GPGSSH_VERIFYTIME prereq | expand |
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index 114785586a..db63aeb6ed 100644 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -135,6 +135,7 @@ test_lazy_prereq GPGSSH ' ' test_lazy_prereq GPGSSH_VERIFYTIME ' + test_have_prereq GPGSSH && # Check if ssh-keygen has a verify-time option by passing an invalid date to it ssh-keygen -Overify-time=INVALID -Y check-novalidate -s doesnotmatter 2>&1 | grep -q -F "Invalid \"verify-time\"" &&
The GPGSSH_VERIFYTIME prequeq makes use of "${GNUPGHOME}" but does not create it. Require GPGSSH which creates the "${GNUPGHOME}" directory. Additionally, it makes sense to require GPGSSH in GPGSSH_VERIFYTIME because the latter builds on the former. If we can't use GPGSSH, there's little point in checking whether GPGSSH_VERIFYTIME is usable. Suggested-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Todd Zullinger <tmz@pobox.com> --- Hi, Junio C Hamano wrote: >> Good idea. Perhaps: >> >> test_lazy_prereq GPGSSH_VERIFYTIME ' >> test_have_prereq GPGSSH && >> >> is best there? The GPGSSH prereq creates ${GNUPGHOME}. It >> may not be common, but there may be folks who want to run >> the SSH tests and don't care about GPG. > > OK. I'll certainly forget, so hold on to the patch and resend after > the dust settles from the release. Alright. Here's that patch. Hopefully it's not too dusty where you are. If so, I can re-send later. :) Cheers, Todd t/lib-gpg.sh | 1 + 1 file changed, 1 insertion(+)