6 files changed, 42 insertions, 7 deletions
diff --git a/checks/ChangeLog b/checks/ChangeLog
index 6d1c7d7aa..b2869731a 100644
--- a/checks/ChangeLog
+++ b/checks/ChangeLog
@@ -1,3 +1,7 @@
+Fri Feb 19 15:49:15 CET 1999  Werner Koch  <[email protected]>
+
+	* genkey1024.test: Be really quiet.
+
 1999-01-01  Geoff Keating  <[email protected]>
 
 	* Makefile.am (CLEANFILES): Also delete trustdb and any leftover
diff --git a/checks/Makefile.am b/checks/Makefile.am
index af588a358..eb83ec4fe 100644
--- a/checks/Makefile.am
+++ b/checks/Makefile.am
@@ -16,7 +16,7 @@ TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
 	     plain-1.asc plain-2.asc plain-3.asc plain-1-pgp.asc \
 	     pubring.pkr.asc secring.skr.asc
 
-DATA_FILES = data-500 data-9000 data-32000 data-80000
+DATA_FILES = data-500 data-9000 data-32000 data-80000 plain-large
 
 EXTRA_DIST = defs.inc run-gpg run-gpgm run-gpg.patterns $(TESTS) $(TEST_FILES)
 CLEANFILES = prepared.stamp x y yy z out err  $(DATA_FILES) \
@@ -63,5 +63,6 @@ data-32000:
 	../tools/mk-tdata 32000  >data-32000
 data-80000:
 	../tools/mk-tdata 80000  >data-80000
-
+plain-large:
+	cat ../doc/HACKING ../doc/DETAILS ../doc/FAQ >plain-large
 
diff --git a/checks/clearsig.test b/checks/clearsig.test
index e5445db7b..99dca45f8 100755
--- a/checks/clearsig.test
+++ b/checks/clearsig.test
@@ -7,20 +7,29 @@
 
 . $srcdir/defs.inc || exit 3
 
+
+# ======================================
 # I can't compare the out because plain-3 has no LF as last charcater
 # but the output has always one.  I do not thinkl this is a bug, because
 # it is clear text and not binary text.
-for i in $plain_files; do
+# ======================================
+for i in $plain_files plain-large ; do
     echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 -sat -o x --yes $i
     $srcdir/run-gpg --verify x
 done
+
+# ======================================
 # and once more to check rfc1991
-for i in $plain_files; do
+# ======================================
+for i in $plain_files plain-large ; do
     echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 \
 			 --rfc1991 --digest-algo md5 -sat -o x --yes $i
     $srcdir/run-gpg --verify x
 done
+
+# ======================================
 # and one with long lines
+# ======================================
 cat >y <<EOF
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxyx
 
@@ -28,19 +37,25 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 EOF
 echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 --clearsign -o x --yes y
 $srcdir/run-gpg --verify x
+
+# ======================================
 # and one with only one long lines
+# ======================================
 cat >y <<EOF
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxyx
 EOF
 echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 --clearsign -o x --yes y
 $srcdir/run-gpg --verify x
 # and one with an empty body
+# ======================================
 cat >y <<EOF
 EOF
 echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 --clearsign -o x --yes y
 $srcdir/run-gpg --verify x
 
+# ======================================
 # and one with one empty line at the end
+# ======================================
 cat >y <<EOF
 line 1
 line 2
@@ -52,3 +67,17 @@ echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 --clearsign -o x --yes y
 $srcdir/run-gpg --verify x
 
 
+# ======================================
+# I think this file will be contructed wrong (gpg 0.9.3)
+# but it should verify okay anyway.
+# bash's builtin echo needs the option -e so we use the external one.
+# ======================================
+echo "this is a sig test" >y
+/bin/echo " \c" >>y
+echo "$usrpass1" | $srcdir/run-gpg --passphrase-fd 0 --clearsign -o x --yes y
+$srcdir/run-gpg --verify x
+
+
+
+
+
diff --git a/checks/defs.inc b/checks/defs.inc
index 42ee1dca8..f8bc3147e 100755
--- a/checks/defs.inc
+++ b/checks/defs.inc
@@ -23,7 +23,6 @@ dsa_keyrings="--keyring ./pubring.pkr --secret-keyring ./secring.skr"
 
 plain_files="plain-1 plain-2 plain-3"
 data_files="data-500 data-9000 data-32000 data-80000"
-#data_files="data-500 data-9000"
 exp_files=""
 
 
diff --git a/checks/genkey1024.test b/checks/genkey1024.test
index e613160f5..ac1868e3d 100755
--- a/checks/genkey1024.test
+++ b/checks/genkey1024.test
@@ -3,7 +3,7 @@
 . $srcdir/defs.inc || exit 3
 
 
-if which expect ; then
+if (expect -v) < /dev/null > /dev/null 2>&1 ; then
   :
 else
   echo "\"expect\" needed but not found - test skipped"
@@ -13,7 +13,7 @@ fi
 LANG=
 LANGUAGE=
 
-expect - <<EOF
+expect - <<EOF >/dev/null
 #set timeout -1
 set timeout 8
 match_max 100000
diff --git a/checks/run-gpg.patterns b/checks/run-gpg.patterns
index 455a3ab6b..9eb355e5b 100644
--- a/checks/run-gpg.patterns
+++ b/checks/run-gpg.patterns
@@ -1,5 +1,7 @@
 gpg: Good signature from
+gpg:                 aka "
 gpg: Signature made
+gpg: ./trustdb.gpg: trustdb created
 gpg: NOTE: cipher algorithm 3 not found in preferences
 gpg: NOTE: cipher algorithm 4 not found in preferences
 gpg: NOTE: secret key 2E5FA4F4 is NOT protected.