commit f0658b18dcb05bb41f06e285734370301ab352f9
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Fri Jan 24 10:17:20 2020 +0100
committer Simon Butcher <simon.butcher@arm.com> Mon Mar 09 17:39:04 2020 +0000
tree 0e433176a3ffbe1642e748cf602a8ef9b7b831aa
parent ae48d86cb166e42986d52b7a8aabf158f69c5f16

Add detection for zlib headers to all.sh

Signed-off-by: Simon Butcher <simon.butcher@arm.com>

tests/scripts/all.sh

diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 6a5b849..bd7e98f 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -662,6 +662,17 @@
     msg "test: ssl-opt.sh (zlib, make)"
     if_build_succeeded tests/ssl-opt.sh
 }
+support_test_zlib_make () {
+    base=support_test_zlib_$$
+    cat <<'EOF' > ${base}.c
+#include "zlib.h"
+int main(void) { return 0; }
+EOF
+    gcc -o ${base}.exe ${base}.c -lz 2>/dev/null
+    ret=$?
+    rm -f ${base}.*
+    return $ret
+}
 
 component_test_zlib_cmake() {
     msg "build: zlib enabled, cmake"
@@ -675,6 +686,9 @@
     msg "test: ssl-opt.sh (zlib, cmake)"
     if_build_succeeded tests/ssl-opt.sh
 }
+support_test_zlib_cmake () {
+    support_test_zlib_make "$@"
+}
 
 component_test_ref_configs () {
     msg "test/build: ref-configs (ASan build)" # ~ 6 min 20s