mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
b41a36e635
commit
c0e0ed6efe
|
@ -26,6 +26,10 @@ else
|
|||
gpg --homedir "${GNUPGHOME}" --import-ownertrust \
|
||||
"$TEST_DIRECTORY"/lib-gpg/ownertrust
|
||||
test_set_prereq GPG
|
||||
if echo | gpg --homedir "${GNUPGHOME}" -b --rfc1991 >/dev/null 2>&1
|
||||
then
|
||||
test_set_prereq RFC1991
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
|
|
@ -1081,7 +1081,7 @@ test_expect_success GPG \
|
|||
get_tag_header rfc1991-signed-tag $commit commit $time >expect
|
||||
echo "RFC1991 signed tag" >>expect
|
||||
echo '-----BEGIN PGP MESSAGE-----' >>expect
|
||||
test_expect_success GPG \
|
||||
test_expect_success GPG,RFC1991 \
|
||||
'creating a signed tag with rfc1991' '
|
||||
echo "rfc1991" >gpghome/gpg.conf &&
|
||||
git tag -s -m "RFC1991 signed tag" rfc1991-signed-tag $commit &&
|
||||
|
@ -1095,7 +1095,7 @@ cp "$1" actual
|
|||
EOF
|
||||
chmod +x fakeeditor
|
||||
|
||||
test_expect_success GPG \
|
||||
test_expect_success GPG,RFC1991 \
|
||||
'reediting a signed tag body omits signature' '
|
||||
echo "rfc1991" >gpghome/gpg.conf &&
|
||||
echo "RFC1991 signed tag" >expect &&
|
||||
|
@ -1103,13 +1103,13 @@ test_expect_success GPG \
|
|||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success GPG \
|
||||
test_expect_success GPG,RFC1991 \
|
||||
'verifying rfc1991 signature' '
|
||||
echo "rfc1991" >gpghome/gpg.conf &&
|
||||
git tag -v rfc1991-signed-tag
|
||||
'
|
||||
|
||||
test_expect_success GPG \
|
||||
test_expect_success GPG,RFC1991 \
|
||||
'list tag with rfc1991 signature' '
|
||||
echo "rfc1991" >gpghome/gpg.conf &&
|
||||
echo "rfc1991-signed-tag RFC1991 signed tag" >expect &&
|
||||
|
@ -1123,12 +1123,12 @@ test_expect_success GPG \
|
|||
|
||||
rm -f gpghome/gpg.conf
|
||||
|
||||
test_expect_success GPG \
|
||||
test_expect_success GPG,RFC1991 \
|
||||
'verifying rfc1991 signature without --rfc1991' '
|
||||
git tag -v rfc1991-signed-tag
|
||||
'
|
||||
|
||||
test_expect_success GPG \
|
||||
test_expect_success GPG,RFC1991 \
|
||||
'list tag with rfc1991 signature without --rfc1991' '
|
||||
echo "rfc1991-signed-tag RFC1991 signed tag" >expect &&
|
||||
git tag -l -n1 rfc1991-signed-tag >actual &&
|
||||
|
@ -1139,7 +1139,7 @@ test_expect_success GPG \
|
|||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success GPG \
|
||||
test_expect_success GPG,RFC1991 \
|
||||
'reediting a signed tag body omits signature' '
|
||||
echo "RFC1991 signed tag" >expect &&
|
||||
GIT_EDITOR=./fakeeditor git tag -f -s rfc1991-signed-tag $commit &&
|
||||
|
|
Loading…
Reference in a new issue