Test: enable internal tests for shared Windows builds

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7462)

diff --git a/test/recipes/02-test_internal_ctype.t b/test/recipes/02-test_internal_ctype.t
index 5bf81bdff18b5c0a6f6d2bcd5a732d33b27e4d76..999002118e50bc277863f53733bdba74de6a5dfd 100644 (file)
--- a/test/recipes/02-test_internal_ctype.t
+++ b/test/recipes/02-test_internal_ctype.t
@@ -14,7 +14,4 @@ use OpenSSL::Test::Utils;
 
 setup("test_internal_ctype");
 
-plan skip_all => "This test is unsupported in a shared library build on Windows"
-    if $^O eq 'MSWin32' && !disabled("shared");
-
 simple_test("test_internal_ctype", "ctype_internal_test");

diff --git a/test/recipes/03-test_internal_asn1.t b/test/recipes/03-test_internal_asn1.t
index d34445f43428a3f21be944e6af955defedf523f3..f6f3b5c07217d7c8cfe83e615668b95bc0028c5a 100644 (file)
--- a/test/recipes/03-test_internal_asn1.t
+++ b/test/recipes/03-test_internal_asn1.t
@@ -13,7 +13,4 @@ use OpenSSL::Test::Utils;
 
 setup("test_internal_asn1");
 
-plan skip_all => "This test is unsupported in a shared library build on Windows"
-    if $^O eq 'MSWin32' && !disabled("shared");
-
 simple_test("test_internal_asn1", "asn1_internal_test");

diff --git a/test/recipes/03-test_internal_chacha.t b/test/recipes/03-test_internal_chacha.t
index bac1328be0d0b90e6e92672df5278f51fa4b7a6c..14ec5c61afe37f513b3e5c8c8ee53f5b9f52478b 100644 (file)
--- a/test/recipes/03-test_internal_chacha.t
+++ b/test/recipes/03-test_internal_chacha.t
@@ -13,7 +13,4 @@ use OpenSSL::Test::Utils;
 
 setup("test_internal_chacha");
 
-plan skip_all => "This test is unsupported in a shared library build on Windows"
-    if $^O eq 'MSWin32' && !disabled("shared");
-
 simple_test("test_internal_chacha", "chacha_internal_test", "chacha");

diff --git a/test/recipes/03-test_internal_curve448.t b/test/recipes/03-test_internal_curve448.t
index fb41a6b5e289871b514d606048f36bf16803bc49..4decc9858454ccd512e9c146248043bc7580649b 100644 (file)
--- a/test/recipes/03-test_internal_curve448.t
+++ b/test/recipes/03-test_internal_curve448.t
@@ -13,9 +13,6 @@ use OpenSSL::Test::Utils;
 
 setup("test_internal_curve448");
 
-plan skip_all => "This test is unsupported in a shared library build on Windows"
-    if $^O eq 'MSWin32' && !disabled("shared");
-
 plan skip_all => "This test is unsupported in a no-ec build"
     if disabled("ec");
 

diff --git a/test/recipes/03-test_internal_modes.t b/test/recipes/03-test_internal_modes.t
index 4371822306848e3d1da5a18978be1703b0fc9673..09c0664b9d5146619b33bd26e12fa6f47ce97a96 100644 (file)
--- a/test/recipes/03-test_internal_modes.t
+++ b/test/recipes/03-test_internal_modes.t
@@ -13,7 +13,4 @@ use OpenSSL::Test::Utils;
 
 setup("test_internal_modes");
 
-plan skip_all => "This test is unsupported in a shared library build on Windows"
-    if $^O eq 'MSWin32' && !disabled("shared");
-
 simple_test("test_internal_modes", "modes_internal_test");

diff --git a/test/recipes/03-test_internal_poly1305.t b/test/recipes/03-test_internal_poly1305.t
index b5809c145f53e2a6cbd404eb55587ebb9926d3a5..a3b98491781422bdb9618e38912451143e555ea4 100644 (file)
--- a/test/recipes/03-test_internal_poly1305.t
+++ b/test/recipes/03-test_internal_poly1305.t
@@ -13,7 +13,4 @@ use OpenSSL::Test::Utils;
 
 setup("test_internal_poly1305");
 
-plan skip_all => "This test is unsupported in a shared library build on Windows"
-    if $^O eq 'MSWin32' && !disabled("shared");
-
 simple_test("test_internal_poly1305", "poly1305_internal_test", "poly1305");

diff --git a/test/recipes/03-test_internal_siphash.t b/test/recipes/03-test_internal_siphash.t
index 1817e4e3dca6469e51e7eb43ef396bf262202a06..f5e88905f2ab0ac9ec38a01c1287d6d74e091d31 100644 (file)
--- a/test/recipes/03-test_internal_siphash.t
+++ b/test/recipes/03-test_internal_siphash.t
@@ -13,7 +13,4 @@ use OpenSSL::Test::Utils;
 
 setup("test_internal_siphash");
 
-plan skip_all => "This test is unsupported in a shared library build on Windows"
-    if $^O eq 'MSWin32' && !disabled("shared");
-
 simple_test("test_internal_siphash", "siphash_internal_test", "siphash");

diff --git a/test/recipes/03-test_internal_sm2.t b/test/recipes/03-test_internal_sm2.t
index b93716e4e3d1f8f3a709d73dbbc45c4d66502fcd..7a3fc41105d81f720620e5a18274aad6dba82adb 100644 (file)
--- a/test/recipes/03-test_internal_sm2.t
+++ b/test/recipes/03-test_internal_sm2.t
@@ -13,7 +13,4 @@ use OpenSSL::Test::Utils;
 
 setup("test_internal_sm2");
 
-plan skip_all => "This test is unsupported in a shared library build on Windows"
-    if $^O eq 'MSWin32' && !disabled("shared");
-
 simple_test("test_internal_sm2", "sm2_internal_test", "sm2");

diff --git a/test/recipes/03-test_internal_sm4.t b/test/recipes/03-test_internal_sm4.t
index 459d83c5189a3972cbd2f1b1871080eed5f5fa98..34de203ace73f2f7b93436a97128bf33c17900ab 100644 (file)
--- a/test/recipes/03-test_internal_sm4.t
+++ b/test/recipes/03-test_internal_sm4.t
@@ -14,7 +14,4 @@ use OpenSSL::Test::Utils;
 
 setup("test_internal_sm4");
 
-plan skip_all => "This test is unsupported in a shared library build on Windows"
-    if $^O eq 'MSWin32' && !disabled("shared");
-
 simple_test("test_internal_sm4", "sm4_internal_test", "sm4");

diff --git a/test/recipes/03-test_internal_ssl_cert_table.t b/test/recipes/03-test_internal_ssl_cert_table.t
index 1cafc23637d844b42fbdd1efbcf11b28dd5c6ba8..8872cd5a345bf7adbb9e60ba1f526fcbb455f15c 100644 (file)
--- a/test/recipes/03-test_internal_ssl_cert_table.t
+++ b/test/recipes/03-test_internal_ssl_cert_table.t
@@ -13,7 +13,4 @@ use OpenSSL::Test::Utils;
 
 setup("test_internal_ssl_cert_table");
 
-plan skip_all => "This test is unsupported in a shared library build on Windows"
-    if $^O eq 'MSWin32' && !disabled("shared");
-
 simple_test("test_internal_ssl_cert_table", "ssl_cert_table_internal_test");

diff --git a/test/recipes/03-test_internal_x509.t b/test/recipes/03-test_internal_x509.t
index d4aaa22e72d248f981951b5a02bf4cfcece32ba1..ef140eb35e973262db675c2df85ba840472f6b92 100644 (file)
--- a/test/recipes/03-test_internal_x509.t
+++ b/test/recipes/03-test_internal_x509.t
@@ -13,7 +13,4 @@ use OpenSSL::Test::Utils;
 
 setup("test_internal_x509");
 
-plan skip_all => "This test is unsupported in a shared library build on Windows"
-    if $^O eq 'MSWin32' && !disabled("shared");
-
 simple_test("test_internal_x509", "x509_internal_test");

diff --git a/test/recipes/06-test-rdrand.t b/test/recipes/06-test-rdrand.t
index ac246bd5cb3782cc3fb48ac323878dd0c9c42cc3..24be8ae9693da2d12637a34ed13caa82b76d3ca9 100644 (file)
--- a/test/recipes/06-test-rdrand.t
+++ b/test/recipes/06-test-rdrand.t
@@ -15,9 +15,6 @@ use OpenSSL::Test::Utils;
 
 setup("test_rdrand_sanity");
 
-plan skip_all => "This test is unsupported in a shared library build on Windows"
-    if $^O eq 'MSWin32' && !disabled("shared");
-
 # We also need static builds to be enabled even on linux
 plan skip_all => "This test is unsupported if static builds are not enabled"
     if disabled("static");

diff --git a/test/recipes/90-test_tls13encryption.t b/test/recipes/90-test_tls13encryption.t
index f997b4dc162c1aebd3af7c8e9d35abc93dcd0ed9..e6ca97a137dadb00fdb5ad711cefadc1309537ea 100644 (file)
--- a/test/recipes/90-test_tls13encryption.t
+++ b/test/recipes/90-test_tls13encryption.t
@@ -15,9 +15,6 @@ setup($test_name);
 plan skip_all => "$test_name is not supported in this build"
     if disabled("tls1_3");
 
-plan skip_all => "This test is unsupported in a shared library build on Windows"
-    if $^O eq 'MSWin32' && !disabled("shared");
-
 plan tests => 1;
 
 ok(run(test(["tls13encryptiontest"])), "running tls13encryptiontest");