1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00

tests/openpgp: Make tests more portable.

* tests/openpgp/default-key.test: Avoid 'grep -q'.
* tests/openpgp/gpgtar.test: Avoid 'grep -qe' and 'diff -q'.
* tests/openpgp/use-exact-key.test: Avoid 'grep -q'.

GnuPG-bug-id: 2262
Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Uldis Anšmits 2016-03-02 17:55:56 +01:00 committed by Justus Winter
parent 50995d2608
commit 1cdb744d91
3 changed files with 6 additions and 6 deletions

View file

@ -35,7 +35,7 @@ do
info "Trying --default-key $x"
if ! echo | $GPG --default-key "$x" -s | $GPG --verify --status-fd=1 \
| grep -q 'VALIDSIG 5FBA84ACE02DCB17DA3DFF6BBCA43C441EA97479'
| grep 'VALIDSIG 5FBA84ACE02DCB17DA3DFF6BBCA43C441EA97479' >/dev/null
then
echo | $GPG --default-key "$x" -s | $GPG --verify --status-fd=2
error "Unexpected key used for signing (not the signing subkey, specified \"$x\")."
@ -59,7 +59,7 @@ do
--default-key "$x" --encrypt-to-default-key \
-r 439F02CA -e \
| $GPG --list-packets \
| grep -q "keyid[ ][A-F0-9]*45117079"
| grep "keyid[ ][A-F0-9]*45117079" >/dev/null
then
echo | $GPG --trust-model=always \
--default-key "$x" --encrypt-to-default-key \