mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
d9839c9d30
* g10/keyring.c (keyring_rebuild_cache): Properly ignore legacy keys in the keyring cache. * tests/migrations/Makefile.am (TESTS): Add new test. * tests/migrations/common.scm (GPG-no-batch): New variable. (run-test): New function. * tests/migrations/issue2276.scm: New file. * tests/migrations/issue2276.tar.asc: Likewise. GnuPG-bug-id: 2276 Signed-off-by: Justus Winter <justus@g10code.com>
53 lines
1.8 KiB
Scheme
53 lines
1.8 KiB
Scheme
;; Copyright (C) 2016 g10 Code GmbH
|
|
;;
|
|
;; This file is part of GnuPG.
|
|
;;
|
|
;; GnuPG is free software; you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation; either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
;;
|
|
;; GnuPG is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
;;
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
|
|
(if (string=? "" (getenv "srcdir"))
|
|
(error "not called from make"))
|
|
|
|
(setenv "GNUPGHOME" "" #t)
|
|
|
|
(define (qualify executable)
|
|
(string-append executable (getenv "EXEEXT")))
|
|
|
|
;; We may not use a relative name for gpg-agent.
|
|
(define GPG-AGENT (qualify (string-append (getcwd) "/../../agent/gpg-agent")))
|
|
(define GPG `(,(qualify (string-append (getcwd) "/../../g10/gpg"))
|
|
--no-permission-warning --no-greeting
|
|
--no-secmem-warning --batch
|
|
,(string-append "--agent-program=" GPG-AGENT
|
|
"|--debug-quick-random")))
|
|
(define GPG-no-batch
|
|
(filter (lambda (arg) (not (equal? arg '--batch))) GPG))
|
|
|
|
(define GPGTAR (qualify (string-append (getcwd) "/../../tools/gpgtar")))
|
|
|
|
(define (untar-armored source-name)
|
|
(pipe:do
|
|
(pipe:open source-name (logior O_RDONLY O_BINARY))
|
|
(pipe:spawn `(,@GPG --dearmor))
|
|
(pipe:spawn `(,GPGTAR --extract --directory=. -))))
|
|
|
|
(define (run-test message src-tarball test)
|
|
(catch (skip "gpgtar not built")
|
|
(call-check `(,GPGTAR --help)))
|
|
|
|
(with-temporary-working-directory
|
|
(info message)
|
|
(untar-armored src-tarball)
|
|
(setenv "GNUPGHOME" (getcwd) #t)
|
|
(test (getcwd))))
|