[PATCH] t7510: do not fail when gpg warns about insecure memory
- From
Kyle J. McKay <mackyle@gmail.com>
- Date
- Mar 8, 2015, 15:40 UTC
- Message-ID
- <2652cb72a82d4ca4be3ea90bafd263e@74d39fa044aa309eaea14b9f57fe79c>
Depending on how gpg was built, it may issue the following message to stderr when run:
Warning: using insecure memory!
Unfortunately when running the test, that message gets collected in the stdout result of git show -s --show-signature but is collected in the stderr result of git verify-commit -v causing both the stdout and stderr result comparisions to fail.
Since checking for secure memory use by gpg is not the point of this test, filter out such messages to allow the test to pass even when gpg is "using insecure memory".
Signed-off-by: Kyle J. McKay <mackyle@gmail.com> --- t/t7510-signed-commit.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh index 474dab38..e86923bc 100755 --- a/t/t7510-signed-commit.sh +++ b/t/t7510-signed-commit.sh @@ -84,9 +84,10 @@ test_expect_success GPG 'verify and show signatures' ' test_expect_success GPG 'show signed commit with signature' ' git show -s initial >commit && git show -s --show-signature initial >show && - git verify-commit -v initial >verify.1 2>verify.2 && + git verify-commit -v initial >verify.1 2>verify.2.out && git cat-file commit initial >cat && - grep -v "gpg: " show >show.commit && + grep -v -e "gpg: " -e "insecure memory" show >show.commit && + grep -v "insecure memory" verify.2.out >verify.2 && grep "gpg: " show >show.gpg && grep -v "^ " cat | grep -v "^gpgsig " >cat.commit && test_cmp show.commit commit && ---