require WOLFSSL_OPENSSL_TEST set for scripts/openssl.test to run, also disable in ipv6 test case because openssl s_server doesn't accept ipv6

pull/160/head
toddouska 2015-10-06 17:02:31 -07:00
parent adb9d27e9e
commit 6d49c308b7
2 changed files with 8 additions and 1 deletions

View File

@ -10,7 +10,6 @@ endif
if BUILD_EXAMPLES if BUILD_EXAMPLES
dist_noinst_SCRIPTS+= scripts/resume.test dist_noinst_SCRIPTS+= scripts/resume.test
dist_noinst_SCRIPTS+= scripts/openssl.test
if BUILD_CRL if BUILD_CRL
# make revoked test rely on completion of resume test # make revoked test rely on completion of resume test
@ -21,6 +20,7 @@ endif
if !BUILD_IPV6 if !BUILD_IPV6
dist_noinst_SCRIPTS+= scripts/external.test dist_noinst_SCRIPTS+= scripts/external.test
dist_noinst_SCRIPTS+= scripts/google.test dist_noinst_SCRIPTS+= scripts/google.test
dist_noinst_SCRIPTS+= scripts/openssl.test
endif endif
endif endif

View File

@ -28,6 +28,13 @@ do_trap() {
trap do_trap INT TERM trap do_trap INT TERM
if test -n "$WOLFSSL_OPENSSL_TEST"; then
echo "WOLFSSL_OPENSSL_TEST set, running test..."
else
echo "WOLFSSL_OPENSSL_TEST NOT set, won't run"
exit 0
fi
echo -e "\nTesting existence of openssl command...\n" echo -e "\nTesting existence of openssl command...\n"
command -v openssl >/dev/null 2>&1 || { echo >&2 "Requires openssl command, but it's not installed. Ending."; exit 0; } command -v openssl >/dev/null 2>&1 || { echo >&2 "Requires openssl command, but it's not installed. Ending."; exit 0; }