t7510: do not fail when gpg warns about insecure memory
Depending on how gpg was built, it may issue the following message to stderr when run: Warning: using insecure memory! When the test is collecting gpg output it is therefore not enough to just match on a "gpg: " prefix it must also match on a "Warning: " prefix wherever it needs to match lines that have been produced by gpg. Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Acked-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Kyle J. McKay committed
Mar 9, 2015 at 13:03 UTC
3f88c1b524b47560a8ef520d7d702c95261d0a97
1 file changed
+2
-2
t/t7510-signed-commit.sh
+2
-2
@@ -73,8 +73,8 @@ test_expect_success GPG 'show signed commit with signature' '
73
git show -s --show-signature initial >show &&
74
git verify-commit -v initial >verify.1 2>verify.2 &&
75
git cat-file commit initial >cat &&
76
- grep -v "gpg: " show >show.commit &&
77
- grep "gpg: " show >show.gpg &&
76
+ grep -v -e "gpg: " -e "Warning: " show >show.commit &&
77
+ grep -e "gpg: " -e "Warning: " show >show.gpg &&
78
grep -v "^ " cat | grep -v "^gpgsig " >cat.commit &&
79
test_cmp show.commit commit &&
80
test_cmp show.gpg verify.2 &&