summaryrefslogtreecommitdiff
path: root/user/gnutls/disable-certtool-test.patch
diff options
context:
space:
mode:
Diffstat (limited to 'user/gnutls/disable-certtool-test.patch')
-rw-r--r--user/gnutls/disable-certtool-test.patch13
1 files changed, 7 insertions, 6 deletions
diff --git a/user/gnutls/disable-certtool-test.patch b/user/gnutls/disable-certtool-test.patch
index 2ae16a38e..39cba942b 100644
--- a/user/gnutls/disable-certtool-test.patch
+++ b/user/gnutls/disable-certtool-test.patch
@@ -15,12 +15,13 @@ GNUTLS_PIN is set).
The folks at Nix believe this is an incompatibility due to musl's
getpass not falling back to stdin/stderr if it cannot connect to a tty,
-as glibc does.
+as glibc does. Upstream believes this test should only be run on glibc
+systems, so we skip it.
https://gitlab.com/gnutls/gnutls/-/issues/945
---- gnutls-3.6.13/tests/cert-tests/certtool 2020-01-01 14:10:19.000000000 -0600
-+++ gnutls-3.6.13/tests/cert-tests/certtool 2020-06-02 20:36:20.380039844 -0500
+--- gnutls-3.6.13/tests/cert-tests/certtool.sh 2020-01-01 14:10:19.000000000 -0600
++++ gnutls-3.6.13/tests/cert-tests/certtool.sh 2020-06-02 20:36:20.380039844 -0500
@@ -20,6 +20,9 @@
#set -e
@@ -28,6 +29,6 @@ https://gitlab.com/gnutls/gnutls/-/issues/945
+echo 'this test is not compatible with musl'
+exit 77
+
- srcdir="${srcdir:-.}"
- CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}"
- DIFF="${DIFF:-diff -b -B}"
+ : ${srcdir=.}
+ : ${CERTTOOL=../../src/certtool${EXEEXT}}
+ : ${DIFF=diff -b -B}