tests: Add missing encrypted sample, cleanup samples handling.

* tests/openpgp/Makefile.am (TEST_FILES): Add new file.
* tests/openpgp/defs.scm (plain-files): Add 'plain-large'.
(all-files): New variable.
(create-sample-files): New function.
(create-legacy-gpghome): Use new function.
* tests/openpgp/plain-large.asc: New file.

Signed-off-by: Justus Winter <justus@g10code.com>

tests/openpgp/Makefile.am

@@ -111,7 +111,7 @@ xcheck:
 
 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 \
-	     plain-largeo.asc \
+	     plain-largeo.asc plain-large.asc \
 	     pubring.pkr.asc secring.skr.asc secdemo.asc pubdemo.asc \
              gpg.conf.tmpl gpg-agent.conf.tmpl \
 	     bug537-test.data.asc bug894-test.asc \

tests/openpgp/defs.scm

@@ -63,9 +63,10 @@
 (define key-file1 "samplekeys/rsa-rsa-sample-1.asc")
 (define key-file2 "samplekeys/ed25519-cv25519-sample-1.asc")
 
-(define plain-files '("plain-1" "plain-2" "plain-3"))
+(define plain-files '("plain-1" "plain-2" "plain-3" "plain-large"))
 (define data-files '("data-500" "data-9000" "data-32000" "data-80000"))
 (define exp-files '())
+(define all-files (append plain-files data-files))
 
 (let ((verbose (string->number (getenv "verbose"))))
   (if (number? verbose)
@@ -256,7 +257,7 @@
   (create-gpghome)
   (start-agent))
 
-(define (create-legacy-gpghome)
+(define (create-sample-files)
   (log "Creating sample data files")
   (for-each
    (lambda (size)
@@ -267,9 +268,11 @@
   (log "Unpacking samples")
   (for-each
    (lambda (name)
-     (dearmor (in-srcdir (string-append name "o.asc")) name))
-   '("plain-1" "plain-2" "plain-3" "plain-large"))
+     (dearmor (in-srcdir ".." "openpgp" (string-append name "o.asc")) name))
+   plain-files))
 
+(define (create-legacy-gpghome)
+  (create-sample-files)
   (mkdir "private-keys-v1.d" "-rwx")
 
   (log "Storing private keys")