[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  1563102bbd6b76d903942c4ca42c5bbdd6ecc765 (commit)
      from  5f7267598d74c2d86c2ef52eab38c91957b19999 (commit)


- Log -----------------------------------------------------------------
commit 1563102bbd6b76d903942c4ca42c5bbdd6ecc765
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri May 13 11:21:06 2016 +0200

    VMS perl: Fix glob output
    
    In some cases, perl's glob() thinks it needs to return file names with
    generation numbers, such as when a file name pattern includes two
    periods.  Constructing other file names by simple appending to file
    names with generation numbers isn't a good idea, so for the VMS case,
    just peal the generation numbers if they are there.
    Fortunately, this is easy, as the returned generation number delimiter
    will always be a semi-colon.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 test/recipes/80-test_ssl_new.t | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 57def45..5cafb9f 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -21,6 +21,7 @@ setup("test_ssl_new");
 $ENV{TEST_CERTS_DIR} = srctop_dir("test", "certs");
 
 my @conf_srcs =  glob(srctop_file("test", "ssl-tests", "*.conf.in"));
+map { s/;.*// } @conf_srcs if $^O eq "VMS";
 my @conf_files = map { basename($_) } @conf_srcs;
 map { s/\.in// } @conf_files;