[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  23049aa52e2b4f12c2c2d7c7d80f5b1876a1b8ba (commit)
      from  453fc7a0185dcd046a8ab2b029e0807a073f93c2 (commit)


- Log -----------------------------------------------------------------
commit 23049aa52e2b4f12c2c2d7c7d80f5b1876a1b8ba
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon May 30 11:20:37 2016 +0200

    perl: use the 'if' module to conditionally load File::Glob
    
    Trying to use normal perl conditions to conditionally 'use' a perl
    module didn't quite work.  Using the 'if' module to do so does work.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 Configure                      | 4 +---
 test/recipes/40-test_rehash.t  | 4 +---
 test/recipes/80-test_ssl_new.t | 4 +---
 test/run_tests.pl              | 4 +---
 util/process_docs.pl           | 4 +---
 5 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/Configure b/Configure
index 9e58fc1..020f2a1 100755
--- a/Configure
+++ b/Configure
@@ -14,9 +14,7 @@ use strict;
 use File::Basename;
 use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs/;
 use File::Path qw/mkpath/;
-if ($^O ne "VMS") {
-    use File::Glob qw/glob/;
-}
+use if $^O ne "VMS", 'File::Glob' => qw/glob/;
 
 # see INSTALL for instructions.
 
diff --git a/test/recipes/40-test_rehash.t b/test/recipes/40-test_rehash.t
index 201d1ad..fa05ca0 100644
--- a/test/recipes/40-test_rehash.t
+++ b/test/recipes/40-test_rehash.t
@@ -13,9 +13,7 @@ use warnings;
 use File::Spec::Functions;
 use File::Copy;
 use File::Basename;
-if ($^O ne "VMS") {
-    use File::Glob qw/glob/;
-}
+use if $^O ne "VMS", 'File::Glob' => qw/glob/;
 use OpenSSL::Test qw/:DEFAULT bldtop_file/;
 
 setup("test_rehash");
diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index b9f3fa8..2bce02a 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -12,9 +12,7 @@ use warnings;
 
 use File::Basename;
 use File::Compare qw/compare_text/;
-if ($^O ne "VMS") {
-    use File::Glob qw/glob/;
-}
+use if $^O ne "VMS", 'File::Glob' => qw/glob/;
 
 use OpenSSL::Test qw/:DEFAULT srctop_dir srctop_file/;
 use OpenSSL::Test::Utils qw/disabled alldisabled available_protocols/;
diff --git a/test/run_tests.pl b/test/run_tests.pl
index b108413..6550e0b 100644
--- a/test/run_tests.pl
+++ b/test/run_tests.pl
@@ -16,9 +16,7 @@ BEGIN {
 
 use File::Spec::Functions qw/catdir catfile curdir abs2rel rel2abs/;
 use File::Basename;
-if ($^O ne "VMS") {
-    use File::Glob qw/glob/;
-}
+use if $^O ne "VMS", 'File::Glob' => qw/glob/;
 use Test::Harness qw/runtests $switches/;
 
 my $srctop = $ENV{SRCTOP} || $ENV{TOP};
diff --git a/util/process_docs.pl b/util/process_docs.pl
index cf1d326..fe8589b 100644
--- a/util/process_docs.pl
+++ b/util/process_docs.pl
@@ -13,9 +13,7 @@ use File::Spec::Functions;
 use File::Basename;
 use File::Copy;
 use File::Path;
-if ($^O ne "VMS") {
-    use File::Glob qw/glob/;
-}
+use if $^O ne "VMS", 'File::Glob' => qw/glob/;
 use Getopt::Long;
 use Pod::Usage;