tests: skip RFC1991 tests for gnupg 2.1
GnuPG >= 2.1.0 no longer supports RFC1991, so skip these tests. Signed-off-by: Christian Hesse <mail@eworm.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Christian Hesse committed
Dec 12, 2014 at 09:50 UTC
c0e0ed6efe497902a2e2ce5fb1586577a27eea1b
2 files changed
+11
-7
t/lib-gpg.sh
+4
@@ -26,6 +26,10 @@ else
26
gpg --homedir "${GNUPGHOME}" --import-ownertrust \
27
"$TEST_DIRECTORY"/lib-gpg/ownertrust
28
test_set_prereq GPG
29
+ if echo | gpg --homedir "${GNUPGHOME}" -b --rfc1991 >/dev/null 2>&1
30
+ then
31
+ test_set_prereq RFC1991
32
+ fi
33
;;
34
esac
35
fi
t/t7004-tag.sh
+7
-7
@@ -1081,7 +1081,7 @@ test_expect_success GPG \
1081
get_tag_header rfc1991-signed-tag $commit commit $time >expect
1082
echo "RFC1991 signed tag" >>expect
1083
echo '-----BEGIN PGP MESSAGE-----' >>expect
1084
-test_expect_success GPG \
1084
+test_expect_success GPG,RFC1991 \
1085
'creating a signed tag with rfc1991' '
1086
echo "rfc1991" >gpghome/gpg.conf &&
1087
git tag -s -m "RFC1991 signed tag" rfc1991-signed-tag $commit &&
@@ -1095,7 +1095,7 @@ cp "$1" actual
1095
EOF
1096
chmod +x fakeeditor
1097
1098
-test_expect_success GPG \
1098
+test_expect_success GPG,RFC1991 \
1099
'reediting a signed tag body omits signature' '
1100
echo "rfc1991" >gpghome/gpg.conf &&
1101
echo "RFC1991 signed tag" >expect &&
@@ -1103,13 +1103,13 @@ test_expect_success GPG \
1103
test_cmp expect actual
1104
'
1105
1106
-test_expect_success GPG \
1106
+test_expect_success GPG,RFC1991 \
1107
'verifying rfc1991 signature' '
1108
echo "rfc1991" >gpghome/gpg.conf &&
1109
git tag -v rfc1991-signed-tag
1110
'
1111
1112
-test_expect_success GPG \
1112
+test_expect_success GPG,RFC1991 \
1113
'list tag with rfc1991 signature' '
1114
echo "rfc1991" >gpghome/gpg.conf &&
1115
echo "rfc1991-signed-tag RFC1991 signed tag" >expect &&
@@ -1123,12 +1123,12 @@ test_expect_success GPG \
1123
1124
rm -f gpghome/gpg.conf
1125
1126
-test_expect_success GPG \
1126
+test_expect_success GPG,RFC1991 \
1127
'verifying rfc1991 signature without --rfc1991' '
1128
git tag -v rfc1991-signed-tag
1129
'
1130
1131
-test_expect_success GPG \
1131
+test_expect_success GPG,RFC1991 \
1132
'list tag with rfc1991 signature without --rfc1991' '
1133
echo "rfc1991-signed-tag RFC1991 signed tag" >expect &&
1134
git tag -l -n1 rfc1991-signed-tag >actual &&
@@ -1139,7 +1139,7 @@ test_expect_success GPG \
1139
test_cmp expect actual
1140
'
1141
1142
-test_expect_success GPG \
1142
+test_expect_success GPG,RFC1991 \
1143
'reediting a signed tag body omits signature' '
1144
echo "RFC1991 signed tag" >expect &&
1145
GIT_EDITOR=./fakeeditor git tag -f -s rfc1991-signed-tag $commit &&