mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-23 10:29:58 +01:00
7e19786a5d
* tests/gpgscm/tests.scm (mkdtemp): Do not magically obey the environment variable 'TMP', make sure to always return an absolute path. * tests/gpgme/Makefile.am (TMP): Drop variable. (TESTS_ENVIRONMENT): Drop 'TMP'. * tests/gpgme/gpgme-defs.scm (create-gpgmehome): Start the agent. Do not create private key store, the agent does that for us. * tests/gpgsm/Makefile.am (TMP): Drop variable. (TESTS_ENVIRONMENT): Drop 'TMP'. * tests/gpgme/gpgme-defs.scm (create-gpgsmhome): Start the agent. Do not create private key store, the agent does that for us. * tests/migrations/Makefile.am (TMP): Drop variable. (TESTS_ENVIRONMENT): Drop 'TMP'. * tests/migrations/common.scm (gpgconf): New variable. (run-test): Create and remove socket directory. * tests/migrations/extended-pkf.scm (src-tarball): Remove variable. (setup): Remove function. (trigger-migration): Likewise. Use 'run-test' to execute the test. * tests/migrations/from-classic.scm (src-tarball): Remove variable. (setup): Remove function. Use 'run-test' to execute the tests. * tests/openpgp/Makefile.am (TMP): Drop variable. (TESTS_ENVIRONMENT): Drop 'TMP'. * tests/openpgp/README: Do not mention 'TMP'. * tests/openpgp/defs.scm (with-home-directory): New macro. (create-legacy-gpghome): Do not create private key store, the agent does that for us. (start-agent): Make sure to terminate the right agent with 'atexit'. -- Previously, the test suite relied upon creating home directories in '/tmp'. This has been problematic in some build environments, although POSIX mandates that '/tmp' must be available. We now rely on 'gpgconf --create-socketdir' to create a suitable socket directory for us. This allows us to get rid of some cruft. It also aligns the environment the tests are run in closer with the environment that we intend that GnuPG runs in. Signed-off-by: Justus Winter <justus@g10code.com>
61 lines
2.2 KiB
Scheme
61 lines
2.2 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"))
|
|
|
|
(let ((verbose (string->number (getenv "verbose"))))
|
|
(if (number? verbose)
|
|
(*set-verbose!* verbose)))
|
|
|
|
(define (qualify executable)
|
|
(string-append executable (getenv "EXEEXT")))
|
|
|
|
;; We may not use a relative name for gpg-agent.
|
|
(define gpgconf (path-join (getenv "objdir") "tools" (qualify "gpgconf")))
|
|
(define GPG-AGENT (path-join (getenv "objdir") "agent" (qualify "gpg-agent")))
|
|
(define GPG `(,(path-join (getenv "objdir") "g10" (qualify "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 (path-join (getenv "objdir") "tools" (qualify "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)
|
|
|
|
(catch (log "Warning: Creating socket directory failed:" (car *error*))
|
|
(call-popen `(,gpgconf --create-socketdir) ""))
|
|
(test (getcwd))
|
|
(catch (log "Warning: Removing socket directory failed.")
|
|
(call-popen `(,gpgconf --remove-socketdir) ""))))
|