Merge #34338: gnutls: fix p11-kit test (failing/skipped)

This commit is contained in:
Vladimír Čunát 2018-01-28 18:03:04 +01:00
commit e5523cd7f6
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA

View File

@ -11,9 +11,10 @@ callPackage ./generic.nix (args // rec {
# Skip two tests introduced in 3.5.11. Probable reasons of failure:
# - pkgconfig: building against the result won't work before installing
# - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox
# Change p11-kit test to use pkg-config to find p11-kit
postPatch = ''
sed '2iexit 77' -i tests/pkgconfig.sh
sed '/^void doit(void)/,$s/{/{ exit(77);/; t' -i tests/trust-store.c
# TODO: remove just this line on some rebuild
sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh
'';
})