From 1901516a4ba909fff12e0e7815aa2d499f4d6d67 Mon Sep 17 00:00:00 2001 From: "Dr. Matthias St. Pierre" Date: Fri, 26 Oct 2018 01:13:19 +0200 Subject: [PATCH] Test: enable internal tests for shared Windows builds Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/7462) --- test/recipes/02-test_internal_ctype.t | 3 --- test/recipes/03-test_internal_asn1.t | 3 --- test/recipes/03-test_internal_chacha.t | 3 --- test/recipes/03-test_internal_curve448.t | 3 --- test/recipes/03-test_internal_modes.t | 3 --- test/recipes/03-test_internal_poly1305.t | 3 --- test/recipes/03-test_internal_siphash.t | 3 --- test/recipes/03-test_internal_sm2.t | 3 --- test/recipes/03-test_internal_sm4.t | 3 --- test/recipes/03-test_internal_ssl_cert_table.t | 3 --- test/recipes/03-test_internal_x509.t | 3 --- test/recipes/06-test-rdrand.t | 3 --- test/recipes/90-test_tls13encryption.t | 3 --- 13 files changed, 39 deletions(-) diff --git a/test/recipes/02-test_internal_ctype.t b/test/recipes/02-test_internal_ctype.t index 5bf81bdff1..999002118e 100644 --- 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 d34445f434..f6f3b5c072 100644 --- 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 bac1328be0..14ec5c61af 100644 --- 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 fb41a6b5e2..4decc98584 100644 --- 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 4371822306..09c0664b9d 100644 --- 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 b5809c145f..a3b9849178 100644 --- 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 1817e4e3dc..f5e88905f2 100644 --- 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 b93716e4e3..7a3fc41105 100644 --- 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 459d83c518..34de203ace 100644 --- 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 1cafc23637..8872cd5a34 100644 --- 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 d4aaa22e72..ef140eb35e 100644 --- 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 ac246bd5cb..24be8ae969 100644 --- 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 f997b4dc16..e6ca97a137 100644 --- 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");