*** empty log message ***

6 files changed, 25 insertions, 10 deletions

diff --git a/checks/ChangeLog b/checks/ChangeLog
index 2adfc1b59..4d99d8629 100644
--- a/checks/ChangeLog
+++ b/checks/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 23 12:25:07 1998  Werner Koch  (wk@isil.d.shuttle.de)
+
+	* run-gpg.patterns: New (because Solaris fgrep does not like -f -).
+
 Mon Aug 10 21:33:38 1998  Werner Koch  (wk@(none))
 
 	* genkey1024.test: Ariel fixed this.
diff --git a/checks/Makefile.am b/checks/Makefile.am
index 351075206..cf784a5bf 100644
--- a/checks/Makefile.am
+++ b/checks/Makefile.am
@@ -18,7 +18,7 @@ TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
 
 DATA_FILES = data-500 data-9000 data-32000 data-80000
 
-EXTRA_DIST = defs.inc run-gpg run-gpgm $(TESTS) $(TEST_FILES)
+EXTRA_DIST = defs.inc run-gpg run-gpgm run-gpg.patterns $(TESTS) $(TEST_FILES)
 CLEANFILES = prepared.stamp x y z out err  $(DATA_FILES) \
 	     plain-1 plain-2 plain-3
 DISTCLEANFILES = pubring.gpg secring.gpg pubring.pkr secring.skr
diff --git a/checks/genkey1024.test b/checks/genkey1024.test
index 95093895d..e419088f2 100755
--- a/checks/genkey1024.test
+++ b/checks/genkey1024.test
@@ -2,9 +2,19 @@
 
 . $srcdir/defs.inc || exit 3
 
+
+if which expect ; then
+  :
+else
+  echo "\"expect\" needed but not found - test skipped"
+  exit 0
+fi
+
+
+
 expect - <<EOF
 #set timeout -1
-set timeout 5
+set timeout 8
 match_max 100000
 spawn ../g10/gpg --no-batch --quick-random --homedir . --gen-key
 expect { 
@@ -86,7 +96,7 @@ some other action (work in another window, move the mouse, utilize the\r
 network and the disks) during the prime generation; this gives the random\r
 number generator a better chance to gain enough entropy.\r" {}
     timeout { exit 1 } }
-set timeout 120
+set timeout 600
 expect {
     -ex "public and secret key created and signed.\r" { exit 0 }
     eof  { exit 1 }
diff --git a/checks/mds.test b/checks/mds.test
index 38ca5fbc6..f945a6cbf 100755
--- a/checks/mds.test
+++ b/checks/mds.test
@@ -3,7 +3,7 @@
 . $srcdir/defs.inc || exit 3
 
 test_one () {
-   if [ "$(grep $1 y | sed -e 's/.*=[ ]\(.*\)/\1/' -e 's/ //g')" != "$2" ]; then
+   if [ "`grep $1 y | sed -e 's/.*=[ ]\(.*\)/\1/' -e 's/ //g'`" != "$2" ]; then
 	failed="$failed $1"
    fi
 }
diff --git a/checks/run-gpg b/checks/run-gpg
index 4128e00d9..518721a40 100755
--- a/checks/run-gpg
+++ b/checks/run-gpg
@@ -10,11 +10,6 @@ else
     rm err.tmp.$$
     exit 1
 fi
-fgrep -v -f - err.tmp.$$ <<EOF
-gpg: Good signature from
-gpg: Signature made
-gpg: note: cipher algorithm 3 not found in preferences
-gpg: note: cipher algorithm 4 not found in preferences
-EOF
+fgrep -v -f run-gpg.patterns err.tmp.$$
 rm err.tmp.$$
 
diff --git a/checks/run-gpg.patterns b/checks/run-gpg.patterns
new file mode 100644
index 000000000..7fd9f2c49
--- /dev/null
+++ b/checks/run-gpg.patterns
@@ -0,0 +1,6 @@
+gpg: Good signature from
+gpg: Signature made
+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.
+gpg: note: secret key 439F02CA is NOT protected.