gnu: gnutls: Enable more testing.

* gnu/packages/tls.scm (gnutls)[native-inputs]: Add NET-TOOLS, IPROUTE,
and SOCAT.
[arguments]: Adjust #:disallowed-references accordingly.
This commit is contained in:
Ludovic Courtès 2020-09-25 14:48:45 +02:00
parent 0e54d63dfa
commit e7ab9c33cc
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5

View file

@ -61,6 +61,7 @@ (define-module (gnu packages tls)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages nettle) #:use-module (gnu packages nettle)
#:use-module (gnu packages networking)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
@ -183,8 +184,11 @@ (define-public gnutls
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? ,(not (hurd-target?)) `(#:tests? ,(not (hurd-target?))
;; Ensure we don't keep a reference to net-tools.
#:disallowed-references ,(if (hurd-target?) '() (list net-tools)) ;; Ensure we don't keep a reference to the tools used for testing.
#:disallowed-references ,(if (hurd-target?)
'()
(list net-tools iproute socat))
#:configure-flags #:configure-flags
(list (list
;; GnuTLS doesn't consult any environment variables to specify ;; GnuTLS doesn't consult any environment variables to specify
@ -236,12 +240,16 @@ (define-public gnutls
"debug" "debug"
"doc")) ;4.1 MiB of man pages "doc")) ;4.1 MiB of man pages
(native-inputs (native-inputs
`(,@(if (hurd-target?) '() `(,@(if (hurd-target?)
`(("net-tools" ,net-tools))) '()
`(("net-tools" ,net-tools)
("iproute" ,iproute) ;for 'ss'
("socat" ,socat))) ;several tests rely on it
("autoconf" ,autoconf) ("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("libtool" ,libtool) ("libtool" ,libtool)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("texinfo" ,texinfo) ("texinfo" ,texinfo)
("which" ,which) ("which" ,which)