projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c49c9bc
)
make expectedout file during keytrans test in test directory, not in the cwd
author
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Mon, 27 Jul 2009 00:30:19 +0000
(20:30 -0400)
committer
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Mon, 27 Jul 2009 00:30:19 +0000
(20:30 -0400)
tests/keytrans
patch
|
blob
|
history
diff --git
a/tests/keytrans
b/tests/keytrans
index 5e7f2b1e3dbcb74351fca065503f2ceee767a866..8808cbc37c95c41ac9bd22bd72395b9570e7295a 100755
(executable)
--- a/
tests/keytrans
+++ b/
tests/keytrans
@@
-127,7
+127,7
@@
PEM2OPENPGP_TIMESTAMP="$timestamp" \
gpg --check-trustdb
gpg --list-keys
gpg --check-trustdb
gpg --list-keys
-cat >expectedout <<EOF
+cat >
"$TEMPDIR"/
expectedout <<EOF
pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
@@
-135,7
+135,7
@@
uid:u::::$timestamp::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
EOF
sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
EOF
-diff -u expectedout <(gpg --check-sigs --with-colons --fixed-list-mode | grep -v ^tru)
+diff -u
"$TEMPDIR"/
expectedout <(gpg --check-sigs --with-colons --fixed-list-mode | grep -v ^tru)
echo "##################################################"
echo "### test User ID revocation ... "
echo "##################################################"
echo "### test User ID revocation ... "
@@
-149,7
+149,7
@@
PEM2OPENPGP_TIMESTAMP="$revtime" \
gpg --check-trustdb
gpg --list-keys
gpg --check-trustdb
gpg --list-keys
-cat >expectedout <<EOF
+cat >
"$TEMPDIR"/
expectedout <<EOF
pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
@@
-159,7
+159,7
@@
rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:
EOF
EOF
-diff -u expectedout <(gpg --check-sigs --with-colons --fixed-list-mode | grep -v ^tru)
+diff -u
"$TEMPDIR"/
expectedout <(gpg --check-sigs --with-colons --fixed-list-mode | grep -v ^tru)
## FIXME: addtest: not testing subkeys at the moment.
## FIXME: addtest: not testing subkeys at the moment.