[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  73540f4729bb856ab066c6e7a57513a97e3ca36f (commit)
      from  d2b53fcdef9e7b482ff1e2d5f305ae798f3d1be2 (commit)


- Log -----------------------------------------------------------------
commit 73540f4729bb856ab066c6e7a57513a97e3ca36f
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Feb 17 14:59:44 2017 +0100

    Fix test_x509_store
    
    Don't run this test unless 'openssl rehash' works properly.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2664)

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

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

diff --git a/test/recipes/60-test_x509_store.t b/test/recipes/60-test_x509_store.t
index b084ed9..041aa09 100644
--- a/test/recipes/60-test_x509_store.t
+++ b/test/recipes/60-test_x509_store.t
@@ -16,6 +16,11 @@ use OpenSSL::Test qw/:DEFAULT srctop_file/;
 
 setup("test_x509_store");
 
+#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"]));
+
 # We use 'openssl verify' for these tests, as it contains everything
 # we need to conduct these tests.  The tests here are a subset of the
 # ones found in 25-test_verify.t