From: Matt Caswell <matt@openssl.org>
Date: Tue, 22 Sep 2015 14:16:29 +0000 (+0100)
Subject: Fix the rehash test on Windows
X-Git-Tag: OpenSSL_1_1_0-pre1~533
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1556d21850aabf31c554d3c6de2363979a965a9f;p=oweals%2Fopenssl.git

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@openssl.org>
---

diff --git a/test/recipes/40-test_rehash.t b/test/recipes/40-test_rehash.t
index 4f0d71fbd2..c4c6abcd93 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 {