Module Name: src
Committed By: lukem
Date: Thu Jun 11 02:48:20 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/tests: cat.at crypt.at
Log Message:
Run the "diff of expected output" in a separate AT_CHECK instead of
using the 'run-if-pass' section; this correctly detects failure.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/netpgp/dist/tests/cat.at
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/netpgp/dist/tests/crypt.at
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/tests/cat.at
diff -u src/crypto/external/bsd/netpgp/dist/tests/cat.at:1.4 src/crypto/external/bsd/netpgp/dist/tests/cat.at:1.5
--- src/crypto/external/bsd/netpgp/dist/tests/cat.at:1.4 Thu Jun 11 02:36:38 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/cat.at Thu Jun 11 02:48:20 2009
@@ -1,4 +1,4 @@
-# $NetBSD: cat.at,v 1.4 2009/06/11 02:36:38 lukem Exp $
+# $NetBSD: cat.at,v 1.5 2009/06/11 02:48:20 lukem Exp $
AT_SETUP([attached signature and verification])
@@ -10,11 +10,13 @@
# Verify sig file
AT_CHECK([netpgp --homedir $testhomedir --cat --output=file3.copy file3.gpg],
- [0], [ignore], [ignore], [ignore], [diff file3.copy file3])
+ [0], [ignore], [ignore])
+AT_CHECK([diff file3 file3.copy])
# Verify sig to stdout
AT_CHECK([netpgp --homedir $testhomedir --cat file3.gpg],
- [0], [ignore], [ignore], [ignore], [diff stdout file3])
+ [0], [stdout], [ignore])
+AT_CHECK([diff file3 stdout])
# XXXTODO: deliberately corrupt file3.gpg and attempt to verify
Index: src/crypto/external/bsd/netpgp/dist/tests/crypt.at
diff -u src/crypto/external/bsd/netpgp/dist/tests/crypt.at:1.5 src/crypto/external/bsd/netpgp/dist/tests/crypt.at:1.6
--- src/crypto/external/bsd/netpgp/dist/tests/crypt.at:1.5 Thu Jun 11 02:36:38 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/crypt.at Thu Jun 11 02:48:20 2009
@@ -1,4 +1,4 @@
-# $NetBSD: crypt.at,v 1.5 2009/06/11 02:36:38 lukem Exp $
+# $NetBSD: crypt.at,v 1.6 2009/06/11 02:48:20 lukem Exp $
AT_SETUP([encryption and decryption])
@@ -14,7 +14,8 @@
# Decrypt and send to a different file
AT_CHECK([netpgp --homedir $testhomedir --decrypt --output=file1.copy file1.gpg],
- [0], [ignore], [ignore], [ignore], [diff file1.copy file1])
+ [0], [ignore], [ignore])
+AT_CHECK([diff file1 file1.copy])
# deliberately corrupt file1.gpg and attempt to decrypt
#sed -e 's|1|2|' file1.gpg > file2.gpg
