From 6d49c308b72484a14aebd4eb0b97f77b452019b1 Mon Sep 17 00:00:00 2001
From: toddouska <todd@wolfssl.com>
Date: Tue, 6 Oct 2015 17:02:31 -0700
Subject: [PATCH] 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

---
 scripts/include.am   | 2 +-
 scripts/openssl.test | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/scripts/include.am b/scripts/include.am
index 34a49bbba..915baf63a 100644
--- a/scripts/include.am
+++ b/scripts/include.am
@@ -10,7 +10,6 @@ endif
 
 if BUILD_EXAMPLES
 dist_noinst_SCRIPTS+= scripts/resume.test
-dist_noinst_SCRIPTS+= scripts/openssl.test
 
 if BUILD_CRL
 # make revoked test rely on completion of resume test
@@ -21,6 +20,7 @@ endif
 if !BUILD_IPV6
 dist_noinst_SCRIPTS+= scripts/external.test
 dist_noinst_SCRIPTS+= scripts/google.test
+dist_noinst_SCRIPTS+= scripts/openssl.test
 endif
 endif
 
diff --git a/scripts/openssl.test b/scripts/openssl.test
index 159214881..708186ab2 100755
--- a/scripts/openssl.test
+++ b/scripts/openssl.test
@@ -28,6 +28,13 @@ do_trap() {
 
 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"
 command -v openssl >/dev/null 2>&1 || { echo >&2 "Requires openssl command, but it's not installed.  Ending."; exit 0; }