From: Richard Levitte <levitte@openssl.org>
Date: Fri, 17 Feb 2017 13:59:44 +0000 (+0100)
Subject: Fix test_x509_store
X-Git-Tag: OpenSSL_1_1_1-pre1~2351
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=73540f4729bb856ab066c6e7a57513a97e3ca36f;p=oweals%2Fopenssl.git

Fix test_x509_store

Don't run this test unless 'openssl rehash' works properly.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2664)
---

diff --git a/test/recipes/60-test_x509_store.t b/test/recipes/60-test_x509_store.t
index b084ed956f..041aa097df 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