diff options
Diffstat (limited to 'checks')
| -rw-r--r-- | checks/ChangeLog | 4 | ||||
| -rw-r--r-- | checks/Makefile.am | 14 | ||||
| -rwxr-xr-x | checks/defs.inc | 10 | ||||
| -rw-r--r-- | checks/options.in | 5 |
4 files changed, 19 insertions, 14 deletions
diff --git a/checks/ChangeLog b/checks/ChangeLog index 4b3a7d072..99e10ea14 100644 --- a/checks/ChangeLog +++ b/checks/ChangeLog @@ -1,5 +1,9 @@ 2001-03-27 Werner Koch <[email protected]> + * defs.inc: Removed creation of options file. + * options.in: New. + * Makefile.am: Create options file and fixed import of pubdemo.asc. + * run-gpg.patterns (gpg): Add some more patterns. 2001-03-20 Werner Koch <[email protected]> diff --git a/checks/Makefile.am b/checks/Makefile.am index 9c8c43d63..6406390a0 100644 --- a/checks/Makefile.am +++ b/checks/Makefile.am @@ -18,8 +18,8 @@ ## Process this file with automake to create Makefile.in -GPG_DEARMOR = ../g10/gpg --no-options --quiet --yes --dearmor -GPG_IMPORT = ../g10/gpg --homedir . --no-options --quiet --yes --import +GPG_DEARMOR = ../g10/gpg --no-options --no-greeting --batch --quiet --yes --dearmor +GPG_IMPORT = ../g10/gpg --homedir . --quiet --yes --import TESTS = version.test mds.test \ decrypt.test decrypt-dsa.test \ @@ -36,7 +36,7 @@ TESTS = version.test mds.test \ 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 secdemo.asc pubdemo.asc + pubring.pkr.asc secring.skr.asc secdemo.asc pubdemo.asc options.in DATA_FILES = data-500 data-9000 data-32000 data-80000 plain-large @@ -44,7 +44,7 @@ EXTRA_DIST = defs.inc run-gpg run-gpg.patterns $(TESTS) $(TEST_FILES) \ mkdemodirs signdemokey CLEANFILES = prepared.stamp x y yy z out err $(DATA_FILES) \ plain-1 plain-2 plain-3 options trustdb.gpg *.lock .\#lk* \ - pubring.gpg secring.gpg pubring.pkr secring.skr + pubring.gpg secring.gpg pubring.pkr secring.skr options DISTCLEANFILES = pubring.gpg~ @@ -54,13 +54,15 @@ distclean-local: ./mkdemodirs --clean prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \ - ./pubring.pkr ./secring.skr $(DATA_FILES) + ./pubring.pkr ./secring.skr ./options $(DATA_FILES) + $(GPG_IMPORT) $(srcdir)/pubdemo.asc echo timestamp >./prepared.stamp +./options: $(srcdir)/options.in + cat $(srcdir)/options.in >./options ./pubring.gpg: $(srcdir)/pubring.asc $(srcdir)/pubdemo.asc $(GPG_DEARMOR) -o ./pubring.gpg $(srcdir)/pubring.asc - $(GPG_IMPORT) $(srcdir)/pubdemo.asc ./secring.gpg: $(srcdir)/secring.asc $(GPG_DEARMOR) -o ./secring.gpg $(srcdir)/secring.asc diff --git a/checks/defs.inc b/checks/defs.inc index 2acf36a36..4a4f764ed 100755 --- a/checks/defs.inc +++ b/checks/defs.inc @@ -98,11 +98,5 @@ pgmname=`basename $0` [ -z "$srcdir" ] && fatal "not called from make" -cat <<EOF >./options -no-greeting -no-secmem-warning -load-extension ../cipher/tiger -batch -emulate-md-encode-bug -EOF - +: +# end
\ No newline at end of file diff --git a/checks/options.in b/checks/options.in new file mode 100644 index 000000000..785a9bdc6 --- /dev/null +++ b/checks/options.in @@ -0,0 +1,5 @@ +no-greeting +no-secmem-warning +load-extension ../cipher/tiger +batch +emulate-md-encode-bug |