Module Name: src
Committed By: lukem
Date: Thu Jun 11 02:28:51 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/tests: atlocal.in cat.at crypt.at
detached.at testsuite.at verify.at
Log Message:
Use AT_TESTED
Modify the PATH to the build dir instead of hardcoding NETPGP* vars.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/netpgp/dist/tests/atlocal.in
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/dist/tests/cat.at
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/netpgp/dist/tests/crypt.at \
src/crypto/external/bsd/netpgp/dist/tests/detached.at
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/netpgp/dist/tests/testsuite.at
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/netpgp/dist/tests/verify.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/atlocal.in
diff -u src/crypto/external/bsd/netpgp/dist/tests/atlocal.in:1.4 src/crypto/external/bsd/netpgp/dist/tests/atlocal.in:1.5
--- src/crypto/external/bsd/netpgp/dist/tests/atlocal.in:1.4 Tue Jun 9 00:51:04 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/atlocal.in Thu Jun 11 02:28:50 2009
@@ -1,12 +1,10 @@
-# $NetBSD: atlocal.in,v 1.4 2009/06/09 00:51:04 agc Exp $
+# $NetBSD: atlocal.in,v 1.5 2009/06/11 02:28:50 lukem Exp $
topsrcd...@abs_top_srcdir@
export TOPSRCDIR
-netp...@abs_top_builddir@/src/netpgp/netpgp
-export NETPGP
-netpgpveri...@abs_top_builddir@/src/netpgpverify/netpgpverify
-export NETPGPVERIFY
+pa...@abs_top_builddir@/src/netpgp:@abs_top_builddir@/src/netpgpverify:$PATH
+export PATH
testhomed...@abs_builddir@/homedir
testpublick...@abs_srcdir@/key-public.asc
Index: src/crypto/external/bsd/netpgp/dist/tests/cat.at
diff -u src/crypto/external/bsd/netpgp/dist/tests/cat.at:1.2 src/crypto/external/bsd/netpgp/dist/tests/cat.at:1.3
--- src/crypto/external/bsd/netpgp/dist/tests/cat.at:1.2 Thu May 28 00:28:38 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/cat.at Thu Jun 11 02:28:50 2009
@@ -1,19 +1,19 @@
-# $NetBSD: cat.at,v 1.2 2009/05/28 00:28:38 lukem Exp $
+# $NetBSD: cat.at,v 1.3 2009/06/11 02:28:50 lukem Exp $
AT_SETUP([attached signature and verification])
AT_CHECK([cp $abs_top_builddir/libtool file3], [0], [ignore], [ignore])
# Make signature
-AT_CHECK([$NETPGP --homedir $testhomedir --sign file3],
+AT_CHECK([netpgp --homedir $testhomedir --sign file3],
[0], [ignore], [ignore])
# Verify sig file
-AT_CHECK([$NETPGP --homedir $testhomedir --cat --output=file3.copy file3.gpg],
+AT_CHECK([netpgp --homedir $testhomedir --cat --output=file3.copy file3.gpg],
[0], [ignore], [ignore], [ignore], [diff file3.copy file3])
# Verify sig to stdout
-AT_CHECK([$NETPGP --homedir $testhomedir --cat file3.gpg],
+AT_CHECK([netpgp --homedir $testhomedir --cat file3.gpg],
[0], [ignore], [ignore], [ignore], [diff stdout file3])
# 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.3 src/crypto/external/bsd/netpgp/dist/tests/crypt.at:1.4
--- src/crypto/external/bsd/netpgp/dist/tests/crypt.at:1.3 Thu May 28 00:29:06 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/crypt.at Thu Jun 11 02:28:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: crypt.at,v 1.3 2009/05/28 00:29:06 lukem Exp $
+# $NetBSD: crypt.at,v 1.4 2009/06/11 02:28:50 lukem Exp $
AT_SETUP([encryption and decryption])
@@ -6,20 +6,20 @@
# Sign the file
# XXX: this prompts for a passphrase when the userid doesn't have one
-AT_CHECK([$NETPGP --homedir $testhomedir --encrypt file1],
+AT_CHECK([netpgp --homedir $testhomedir --encrypt file1],
[0], [ignore], [ignore])
# Decrypt the encrypted file
-AT_CHECK([$NETPGP --homedir $testhomedir --decrypt file1.gpg],
+AT_CHECK([netpgp --homedir $testhomedir --decrypt file1.gpg],
[0], [ignore], [ignore])
# Decrypt and send to a different file
-AT_CHECK([$NETPGP --homedir $testhomedir --decrypt --output=file1.copy file1.gpg],
+AT_CHECK([netpgp --homedir $testhomedir --decrypt --output=file1.copy file1.gpg],
[0], [ignore], [ignore], [ignore], [diff file1.copy file1])
# deliberately corrupt file1.gpg and attempt to decrypt
#sed -e 's|1|2|' file1.gpg > file2.gpg
-#AT_CHECK([$NETPGP --homedir $testhomedir --decrypt file2.gpg],
+#AT_CHECK([netpgp --homedir $testhomedir --decrypt file2.gpg],
# [0], [ignore],
#[netpgp: default key set to "C7AB5F325F918728"
#/usr/src/crypto/external/bsd/netpgp-hack/lib/../dist/src/lib/reader.c:1614: Unknown, Bad hash in MDC packet
Index: src/crypto/external/bsd/netpgp/dist/tests/detached.at
diff -u src/crypto/external/bsd/netpgp/dist/tests/detached.at:1.3 src/crypto/external/bsd/netpgp/dist/tests/detached.at:1.4
--- src/crypto/external/bsd/netpgp/dist/tests/detached.at:1.3 Thu May 28 00:29:06 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/detached.at Thu Jun 11 02:28:50 2009
@@ -1,15 +1,15 @@
-# $NetBSD: detached.at,v 1.3 2009/05/28 00:29:06 lukem Exp $
+# $NetBSD: detached.at,v 1.4 2009/06/11 02:28:50 lukem Exp $
AT_SETUP([detached signature and verification])
AT_CHECK([cp ${TOPSRCDIR}/configure file2], [0], [ignore], [ignore])
# Detached signature
-AT_CHECK([$NETPGP --homedir $testhomedir --sign --detached file2],
+AT_CHECK([netpgp --homedir $testhomedir --sign --detached file2],
[0], [ignore], [ignore])
# Verify detached sig file
-AT_CHECK([$NETPGP --homedir $testhomedir --verify file2.sig],
+AT_CHECK([netpgp --homedir $testhomedir --verify file2.sig],
[0], [ignore], [ignore])
AT_CLEANUP
Index: src/crypto/external/bsd/netpgp/dist/tests/testsuite.at
diff -u src/crypto/external/bsd/netpgp/dist/tests/testsuite.at:1.5 src/crypto/external/bsd/netpgp/dist/tests/testsuite.at:1.6
--- src/crypto/external/bsd/netpgp/dist/tests/testsuite.at:1.5 Thu May 28 00:27:39 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/testsuite.at Thu Jun 11 02:28:50 2009
@@ -1,7 +1,9 @@
-# $NetBSD: testsuite.at,v 1.5 2009/05/28 00:27:39 lukem Exp $
+# $NetBSD: testsuite.at,v 1.6 2009/06/11 02:28:50 lukem Exp $
AT_INIT([netpgp])
+AT_TESTED([netpgp netpgpverify])
+
m4_include([init.at])
m4_include([cat.at])
Index: src/crypto/external/bsd/netpgp/dist/tests/verify.at
diff -u src/crypto/external/bsd/netpgp/dist/tests/verify.at:1.6 src/crypto/external/bsd/netpgp/dist/tests/verify.at:1.7
--- src/crypto/external/bsd/netpgp/dist/tests/verify.at:1.6 Thu May 28 00:29:06 2009
+++ src/crypto/external/bsd/netpgp/dist/tests/verify.at Thu Jun 11 02:28:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: verify.at,v 1.6 2009/05/28 00:29:06 lukem Exp $
+# $NetBSD: verify.at,v 1.7 2009/06/11 02:28:50 lukem Exp $
AT_SETUP([simple signature and verification])
@@ -6,16 +6,16 @@
# Sign the file
# XXX: this prompts for a passphrase when the userid doesn't have one
-AT_CHECK([$NETPGP --homedir $testhomedir --sign file1],
+AT_CHECK([netpgp --homedir $testhomedir --sign file1],
[0], [ignore], [ignore])
# Verify the signed file
-AT_CHECK([$NETPGP --homedir $testhomedir --verify file1.gpg],
+AT_CHECK([netpgp --homedir $testhomedir --verify file1.gpg],
[0], [ignore], [ignore])
# Fail to verify an unsigned file
# XXX: determine how to expand $testuserid instead of hard-coding
-AT_CHECK([$NETPGP --homedir $testhomedir --verify file1],
+AT_CHECK([netpgp --homedir $testhomedir --verify file1],
[1], [ignore],
[netpgp: default key set to "C7AB5F325F918728"
"file1": No signatures found - is this a signed file?
@@ -23,7 +23,7 @@
# XXXTODO: deliberately corrupt file2.gpg and attempt to verify
sed -e 's|1|2|' file1.gpg > file2.gpg
-AT_CHECK([$NETPGP --homedir $testhomedir --verify file2.gpg],
+AT_CHECK([netpgp --homedir $testhomedir --verify file2.gpg],
[1], [ignore],
[netpgp: default key set to "C7AB5F325F918728"
"file2.gpg": verification failure: 1 invalid signatures, 0 unknown signatures
