[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  1556d21850aabf31c554d3c6de2363979a965a9f (commit)
      from  e15a18de96b8c948cc69df35aba7e1e245f6c999 (commit)


- Log -----------------------------------------------------------------
commit 1556d21850aabf31c554d3c6de2363979a965a9f
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 22 15:16:29 2015 +0100

    Fix the rehash test on Windows
    
    The openssl rehash command is not available on some platforms including
    Windows. This change skips the associated tests if rehash is not available.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 test/recipes/40-test_rehash.t | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/recipes/40-test_rehash.t b/test/recipes/40-test_rehash.t
index 4f0d71f..c4c6abc 100644
--- a/test/recipes/40-test_rehash.t
+++ b/test/recipes/40-test_rehash.t
@@ -10,6 +10,11 @@ use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_rehash");
 
+#If "openssl rehash -help" fails it's most likely because we're on a platform
+#that doesn't support the rehash command (e.g. Windows)
+plan skip_all => "test_rehash is not available on this platform"
+    unless run(app(["openssl", "rehash", "-help"]));
+
 plan tests => 5;
 
 indir "rehash.$$" => sub {