mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-11 01:54:36 +08:00
94 lines
2.8 KiB
Diff
94 lines
2.8 KiB
Diff
From 2bbdf8703ea22b91f6d0b12b8c4ff3b90293b717 Mon Sep 17 00:00:00 2001
|
|
From: Christian Hesse <mail@eworm.de>
|
|
Date: Fri, 12 Dec 2014 07:40:28 +0100
|
|
Subject: [PATCH 2/3] skip RFC1991 tests for gnupg 2.1
|
|
|
|
GnuPG >= 2.1.0 does not longer support RFC1991, so skip these
|
|
tests.
|
|
|
|
Signed-off-by: Christian Hesse <mail@eworm.de>
|
|
---
|
|
t/lib-gpg.sh | 3 +++
|
|
t/t7004-tag.sh | 14 +++++++-------
|
|
2 files changed, 10 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
|
|
index 4e57942..b0138ad 100755
|
|
--- a/t/lib-gpg.sh
|
|
+++ b/t/lib-gpg.sh
|
|
@@ -26,6 +26,9 @@ 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>/dev/null; then
|
|
+ test_set_prereq RFC1991
|
|
+ fi
|
|
;;
|
|
esac
|
|
fi
|
|
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
|
|
index 796e9f7..35c805a 100755
|
|
--- a/t/t7004-tag.sh
|
|
+++ b/t/t7004-tag.sh
|
|
@@ -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 &&
|
|
--
|
|
2.2.0
|
|
|