summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-07-26 20:30:19 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-07-26 20:30:19 -0400
commitb35bedeb0f5788345be2f9c1ac7753a3d002cb97 (patch)
tree275512f1e56c77dc305099b47829a35884481825
parentc49c9bc21a6877cd3a7a610c00efcffbc1c29273 (diff)
make expectedout file during keytrans test in test directory, not in the cwd
-rwxr-xr-xtests/keytrans8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/keytrans b/tests/keytrans
index 5e7f2b1..8808cbc 100755
--- a/tests/keytrans
+++ b/tests/keytrans
@@ -127,7 +127,7 @@ PEM2OPENPGP_TIMESTAMP="$timestamp" \
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:
@@ -135,7 +135,7 @@ uid:u::::$timestamp::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
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 ... "
@@ -149,7 +149,7 @@ PEM2OPENPGP_TIMESTAMP="$revtime" \
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:
@@ -159,7 +159,7 @@ rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:
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.