[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  fd2107e077c94b61df7dcca0cc1aed9b833927dd (commit)
      from  ad2aa727cda07b324c447aab654cd77da2914c3b (commit)


- Log -----------------------------------------------------------------
commit fd2107e077c94b61df7dcca0cc1aed9b833927dd
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Aug 31 17:07:44 2016 +0200

    Make it possible to disable fuzz testing
    
    These tests take a very long time on some platforms, and arent't
    always strictly necessary.  This makes it possible to turn them
    off.  The necessary binaries are still built, though, in case
    someone still wants to do a manual run.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (cherry picked from commit eb40eaed727500bf4a15f848c99e37edd18e142e)

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

Summary of changes:
 Configure                   | 1 +
 test/recipes/05-test_fuzz.t | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Configure b/Configure
index 1331360..b95f311 100755
--- a/Configure
+++ b/Configure
@@ -342,6 +342,7 @@ my @disablables = (
     "filenames",
     "fuzz-libfuzzer",
     "fuzz-afl",
+    "fuzz-test",
     "gost",
     "heartbeats",
     "hw(-.+)?",
diff --git a/test/recipes/05-test_fuzz.t b/test/recipes/05-test_fuzz.t
index d152925..f1ccfe3 100755
--- a/test/recipes/05-test_fuzz.t
+++ b/test/recipes/05-test_fuzz.t
@@ -15,6 +15,9 @@ use OpenSSL::Test::Utils;
 
 setup("test_fuzz");
 
+plan skip_all => "Fuzz testing is disabled by this OpenSSL build"
+    if disabled("fuzz-test");
+
 my @fuzzers = ('asn1', 'asn1parse', 'bignum', 'bndiv', 'conf', 'crl', 'server', 'x509');
 if (!disabled("cms")) {
     push @fuzzers, 'cms';