From: Johannes Sixt Date: Wed, 02 Apr 2008 06:52:37 GMT Subject: [PATCH] t7004-tag: Skip more tests if gpg is not available. Message-ID: <47F32D35.3010407@viscovery.net> From: Johannes Sixt This test was already careful enough to skip signed tag tests if gpg is not available, but it must also skip all verify tests, even those that are about non-signed tags, because they also invoke gpg. Signed-off-by: Johannes Sixt --- t/t7004-tag.sh | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index 2b4c270..c4854c3 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -579,6 +579,14 @@ test_expect_success \ git diff expect actual ' +# subsequent tests require gpg; check if it is available +gpg --version >/dev/null +if [ $? -eq 127 ]; then + echo "gpg not found - skipping tag signing and verification tests" + test_done + exit +fi + # trying to verify annotated non-signed tags: test_expect_success \ @@ -601,13 +609,6 @@ test_expect_success \ # creating and verifying signed tags: -gpg --version >/dev/null -if [ $? -eq 127 ]; then - echo "Skipping signed tags tests, because gpg was not found" - test_done - exit -fi - # As said here: http://www.gnupg.org/documentation/faqs.html#q6.19 # the gpg version 1.0.6 didn't parse trust packets correctly, so for # that version, creation of signed tags using the generated key fails. -- 1.5.5.rc2.861.g18c5b.dirty