[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  3a80bd29be74b50771dd20e15282db693dbe9522 (commit)
       via  b3068d0ac48c827403115a3b5cbc3655243e2cf0 (commit)
      from  a5bb1aa128dcadf7a026061b2804646f5fbaa72c (commit)


- Log -----------------------------------------------------------------
commit 3a80bd29be74b50771dd20e15282db693dbe9522
Author: Andy Polyakov <appro at openssl.org>
Date:   Tue Mar 14 21:29:24 2017 +0100

    NOTES.WIN: mention Strawberry Perl as option.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit b3068d0ac48c827403115a3b5cbc3655243e2cf0
Author: Andy Polyakov <appro at openssl.org>
Date:   Tue Mar 14 15:23:39 2017 +0100

    test/recipes/03-test_internal_*: call setup() first.
    
    Strawberry Perl bailed out running test\run_tests.pl insisting on
    setup() being called explicitly.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 NOTES.WIN                                | 3 ++-
 test/recipes/03-test_internal_asn1.t     | 2 ++
 test/recipes/03-test_internal_chacha.t   | 2 ++
 test/recipes/03-test_internal_modes.t    | 2 ++
 test/recipes/03-test_internal_poly1305.t | 2 ++
 test/recipes/03-test_internal_siphash.t  | 2 ++
 test/recipes/03-test_internal_x509.t     | 2 ++
 7 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/NOTES.WIN b/NOTES.WIN
index 2a3c1e1..c31aed9 100644
--- a/NOTES.WIN
+++ b/NOTES.WIN
@@ -9,7 +9,8 @@
  this are required as well:
 
  - You need Perl.  We recommend ActiveState Perl, available from
-   https://www.activestate.com/ActivePerl.
+   https://www.activestate.com/ActivePerl. Another viable alternative
+   appears to be Strawberry Perl, http://strawberryperl.com.
    You also need the perl module Text::Template, available on CPAN.
    Please read NOTES.PERL for more information.
 
diff --git a/test/recipes/03-test_internal_asn1.t b/test/recipes/03-test_internal_asn1.t
index 2db7813..d34445f 100644
--- a/test/recipes/03-test_internal_asn1.t
+++ b/test/recipes/03-test_internal_asn1.t
@@ -11,6 +11,8 @@ use OpenSSL::Test;              # get 'plan'
 use OpenSSL::Test::Simple;
 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");
 
diff --git a/test/recipes/03-test_internal_chacha.t b/test/recipes/03-test_internal_chacha.t
index 642c00a..58e21f7 100644
--- a/test/recipes/03-test_internal_chacha.t
+++ b/test/recipes/03-test_internal_chacha.t
@@ -11,6 +11,8 @@ use OpenSSL::Test;              # get 'plan'
 use OpenSSL::Test::Simple;
 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");
 
diff --git a/test/recipes/03-test_internal_modes.t b/test/recipes/03-test_internal_modes.t
index 9f66702..4371822 100644
--- a/test/recipes/03-test_internal_modes.t
+++ b/test/recipes/03-test_internal_modes.t
@@ -11,6 +11,8 @@ use OpenSSL::Test;              # get 'plan'
 use OpenSSL::Test::Simple;
 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");
 
diff --git a/test/recipes/03-test_internal_poly1305.t b/test/recipes/03-test_internal_poly1305.t
index 1c88d28..2f5625d 100644
--- a/test/recipes/03-test_internal_poly1305.t
+++ b/test/recipes/03-test_internal_poly1305.t
@@ -11,6 +11,8 @@ use OpenSSL::Test;              # get 'plan'
 use OpenSSL::Test::Simple;
 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");
 
diff --git a/test/recipes/03-test_internal_siphash.t b/test/recipes/03-test_internal_siphash.t
index f8569de..1a8a617 100644
--- a/test/recipes/03-test_internal_siphash.t
+++ b/test/recipes/03-test_internal_siphash.t
@@ -11,6 +11,8 @@ use OpenSSL::Test;              # get 'plan'
 use OpenSSL::Test::Simple;
 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");
 
diff --git a/test/recipes/03-test_internal_x509.t b/test/recipes/03-test_internal_x509.t
index 2f6402c..d4aaa22 100644
--- a/test/recipes/03-test_internal_x509.t
+++ b/test/recipes/03-test_internal_x509.t
@@ -11,6 +11,8 @@ use OpenSSL::Test;              # get 'plan'
 use OpenSSL::Test::Simple;
 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");