From e463cb39d32d3621183e9a1d487daae13ff716e3 Mon Sep 17 00:00:00 2001
From: Matt Caswell <matt@openssl.org>
Date: Mon, 23 Jan 2017 14:53:44 +0000
Subject: [PATCH] Enable wpacket test on shared builds

Now that we support internal tests properly, we can test wpacket even in
shared builds.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)
---
 test/build.info                | 12 ++++++------
 test/recipes/70-test_wpacket.t |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/build.info b/test/build.info
index c116238948..a6a5c7ca84 100644
--- a/test/build.info
+++ b/test/build.info
@@ -309,11 +309,7 @@ IF[{- !$disabled{tests} -}]
   ENDIF
 
   IF[{- $disabled{shared} -}]
-    PROGRAMS_NO_INST=wpackettest cipher_overhead_test
-    SOURCE[wpackettest]=wpackettest.c testutil.c test_main_custom.c
-    INCLUDE[wpackettest]=../include
-    DEPEND[wpackettest]=../libcrypto ../libssl
-
+    PROGRAMS_NO_INST=cipher_overhead_test
     SOURCE[cipher_overhead_test]=cipher_overhead_test.c
     INCLUDE[cipher_overhead_test]=.. ../include
     DEPEND[cipher_overhead_test]=../libcrypto ../libssl
@@ -334,7 +330,7 @@ IF[{- !$disabled{tests} -}]
   # names with the DLL import libraries.
   IF[{- $disabled{shared} || $target{build_scheme}->[1] ne 'windows' -}]
     PROGRAMS_NO_INST=asn1_internal_test modes_internal_test x509_internal_test \
-                     tls13encryptiontest
+                     tls13encryptiontest wpackettest
     IF[{- !$disabled{poly1305} -}]
       PROGRAMS_NO_INST=poly1305_internal_test
     ENDIF
@@ -358,6 +354,10 @@ IF[{- !$disabled{tests} -}]
     SOURCE[tls13encryptiontest]=tls13encryptiontest.c testutil.c test_main.c
     INCLUDE[tls13encryptiontest]=.. ../include
     DEPEND[tls13encryptiontest]=../libcrypto ../libssl.a
+
+    SOURCE[wpackettest]=wpackettest.c testutil.c test_main_custom.c
+    INCLUDE[wpackettest]=../include
+    DEPEND[wpackettest]=../libcrypto ../libssl.a
   ENDIF
 
   IF[{- !$disabled{mdc2} -}]
diff --git a/test/recipes/70-test_wpacket.t b/test/recipes/70-test_wpacket.t
index 9170122b77..6d50b9f809 100644
--- a/test/recipes/70-test_wpacket.t
+++ b/test/recipes/70-test_wpacket.t
@@ -12,8 +12,8 @@ use OpenSSL::Test::Utils;
 
 setup("test_wpacket");
 
-plan skip_all => "Only supported in no-shared builds"
-    if !disabled("shared");
+plan skip_all => "Test disabled in this configuration"
+    if $^O eq 'MSWin32' && !disabled("shared");
 
 plan tests => 1;
 
-- 
2.25.1