t7004-tag: Skip more tests if gpg is not available.
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 <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Sixt committed
Apr 2, 2008 at 08:52 UTC
64fb19ba636fc9e892119efc377808b86c919228
1 file changed
+8
-7
t/t7004-tag.sh
+8
-7
@@ -578,6 +578,14 @@ test_expect_success \
578
git diff expect actual
579
'
580
581
+# subsequent tests require gpg; check if it is available
582
+gpg --version >/dev/null
583
+if [ $? -eq 127 ]; then
584
+ echo "gpg not found - skipping tag signing and verification tests"
585
+ test_done
586
+ exit
587
+fi
588
+
589
# trying to verify annotated non-signed tags:
590
591
test_expect_success \
@@ -600,13 +608,6 @@ test_expect_success \
608
609
# creating and verifying signed tags:
610
603
-gpg --version >/dev/null
604
-if [ $? -eq 127 ]; then
605
- echo "Skipping signed tags tests, because gpg was not found"
606
- test_done
607
- exit
608
-fi
609
-
611
# As said here: http://www.gnupg.org/documentation/faqs.html#q6.19
612
# the gpg version 1.0.6 didn't parse trust packets correctly, so for
613
# that version, creation of signed tags using the generated key fails.