Merge branch 'test-mingw-macos' into 'master'

Fix MacOS X builds

See merge request gnutls/gnutls!826

7 files changed, 9 insertions, 8 deletions

diff --git a/.travis.yml b/.travis.yml
index 72727c30bb..d060703983 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,5 +33,6 @@ script:
   - make -j$(sysctl -n hw.ncpu) check gl_public_submodule_commit=
 
 after_failure:
+  - find . -name 'test-suite.log' -execdir grep -il "FAILED" {} \; -exec echo {} \; -exec cat {} \;
   - for i in tests/*.log fuzz/*.log;do echo "" && echo $i && cat $i;done
 
diff --git a/tests/cert-tests/crl b/tests/cert-tests/crl
index bea0c5237e..9ca61d7700 100755
--- a/tests/cert-tests/crl
+++ b/tests/cert-tests/crl
@@ -63,7 +63,7 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-if grep -v '^-----BEGIN [A-Z0-9 ]\+-----$\|^[A-Za-z0-9/+=]\+$\|^-----END [A-Z0-9 ]\+-----$' ${TMP2FILE} ; then
+if grep -v '^-----BEGIN [A-Z0-9 ]\+-----$' ${TMP2FILE} | grep -v '^[A-Za-z0-9/+=]\+$' | grep -v '^-----END [A-Z0-9 ]\+-----$' ; then
 	echo "--no-text crl info failed 2"
 	exit 1
 fi
diff --git a/tests/cert-tests/crq b/tests/cert-tests/crq
index 58581e4148..e29f17a17f 100755
--- a/tests/cert-tests/crq
+++ b/tests/cert-tests/crq
@@ -74,7 +74,7 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-if grep -v '^-----BEGIN [A-Z0-9 ]\+-----$\|^[A-Za-z0-9/+=]\+$\|^-----END [A-Z0-9 ]\+-----$' ${TMPFILE} ; then
+if grep -v '^-----BEGIN [A-Z0-9 ]\+-----$' ${TMPFILE} | grep -v '^[A-Za-z0-9/+=]\+$' | grep -v '^-----END [A-Z0-9 ]\+-----$' ; then
 	echo "--no-text crq info failed 2"
 	exit 1
 fi
diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding
index c5ba22e26d..1daf926317 100755
--- a/tests/cert-tests/pem-decoding
+++ b/tests/cert-tests/pem-decoding
@@ -188,7 +188,7 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-if grep -v '^-----BEGIN [A-Z0-9 ]\+-----$\|^[A-Za-z0-9/+=]\+$\|^-----END [A-Z0-9 ]\+-----$' ${TMPFILE} ; then
+if grep -v '^-----BEGIN [A-Z0-9 ]\+-----$' ${TMPFILE} | grep -v '^[A-Za-z0-9/+=]\+$' | grep -v '^-----END [A-Z0-9 ]\+-----$' ; then
 	echo "--no-text -k --certificate-info failed 2"
 	exit 1
 fi
@@ -202,7 +202,7 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-if grep -v '^-----BEGIN [A-Z0-9 ]\+-----$\|^[A-Za-z0-9/+=]\+$\|^-----END [A-Z0-9 ]\+-----$' ${TMPFILE} ; then
+if grep -v '^-----BEGIN [A-Z0-9 ]\+-----$' ${TMPFILE} | grep -v '^[A-Za-z0-9/+=]\+$' | grep -v '^-----END [A-Z0-9 ]\+-----$' ; then
 	echo "--no-text cert pubkey failed 2"
 	exit 1
 fi
@@ -216,7 +216,7 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-if grep -v '^-----BEGIN [A-Z0-9 ]\+-----$\|^[A-Za-z0-9/+=]\+$\|^-----END [A-Z0-9 ]\+-----$' ${TMPFILE} ; then
+if grep -v '^-----BEGIN [A-Z0-9 ]\+-----$' ${TMPFILE} | grep -v '^[A-Za-z0-9/+=]\+$' | grep -v '^-----END [A-Z0-9 ]\+-----$' ; then
 	echo "--no-text pubkey info failed 2"
 	exit 1
 fi
diff --git a/tests/cert-tests/pkcs12 b/tests/cert-tests/pkcs12
index d05389d10f..f28230a7b2 100755
--- a/tests/cert-tests/pkcs12
+++ b/tests/cert-tests/pkcs12
@@ -88,7 +88,7 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-if grep -v '^-----BEGIN [A-Z0-9 ]\+-----$\|^[A-Za-z0-9/+=]\+$\|^-----END [A-Z0-9 ]\+-----$' ${TMPFILE} ; then
+if grep -v '^-----BEGIN [A-Z0-9 ]\+-----$' ${TMPFILE} | grep -v '^[A-Za-z0-9/+=]\+$' | grep -v '^-----END [A-Z0-9 ]\+-----$' ; then
 	echo "--no-text pkcs12 info failed 2"
 	exit 1
 fi
diff --git a/tests/cert-tests/pkcs7 b/tests/cert-tests/pkcs7
index bfe11290fc..eed9f068a2 100755
--- a/tests/cert-tests/pkcs7
+++ b/tests/cert-tests/pkcs7
@@ -72,7 +72,7 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-if grep -v '^-----BEGIN [A-Z0-9 ]\+-----$\|^[A-Za-z0-9/+=]\+$\|^-----END [A-Z0-9 ]\+-----$' ${TMPFILE} ; then
+if grep -v '^-----BEGIN [A-Z0-9 ]\+-----$' ${TMPFILE} | grep -v '^[A-Za-z0-9/+=]\+$' | grep -v '^-----END [A-Z0-9 ]\+-----$' ; then
 	echo "--no-text pkcs7 info failed 2"
 	exit 1
 fi
diff --git a/tests/cert-tests/privkey-import b/tests/cert-tests/privkey-import
index f3f94806fa..73bacae253 100755
--- a/tests/cert-tests/privkey-import
+++ b/tests/cert-tests/privkey-import
@@ -52,7 +52,7 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-if grep -v '^-----BEGIN [A-Z0-9 ]\+-----$\|^[A-Za-z0-9/+=]\+$\|^-----END [A-Z0-9 ]\+-----$' ${TMPFILE} ; then
+if grep -v '^-----BEGIN [A-Z0-9 ]\+-----$' ${TMPFILE} | grep -v '^[A-Za-z0-9/+=]\+$' | grep -v '^-----END [A-Z0-9 ]\+-----$' ; then
 	echo "--no-text privkey info failed 2"
 	exit 1
 fi