[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  eb40eaed727500bf4a15f848c99e37edd18e142e (commit)
      from  68b4a6e91f5acd42489bb9d1c580acc5ae457cad (commit)


- Log -----------------------------------------------------------------
commit eb40eaed727500bf4a15f848c99e37edd18e142e
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>

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

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';