Configure,test/recipes: "pin" glob to File::Glob::glob.

[openssl.git] / test / recipes / 40-test_rehash.t

diff --git a/test/recipes/40-test_rehash.t b/test/recipes/40-test_rehash.t
index c4c6abcd93e1e9c1f45a99a14ac82a48fd854425..201d1add134b5e886c9954350de8413ac4b7107e 100644 (file)
--- a/test/recipes/40-test_rehash.t
+++ b/test/recipes/40-test_rehash.t
@@ -1,4 +1,11 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
+# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
 
 use strict;
 use warnings;
@@ -6,7 +13,10 @@ use warnings;
 use File::Spec::Functions;
 use File::Copy;
 use File::Basename;
-use OpenSSL::Test qw/:DEFAULT top_file/;
+if ($^O ne "VMS") {
+    use File::Glob qw/glob/;
+}
+use OpenSSL::Test qw/:DEFAULT bldtop_file/;
 
 setup("test_rehash");
 
@@ -39,7 +49,7 @@ indir "rehash.$$" => sub {
     chmod 0500, curdir();
   SKIP: {
       if (!ok(!open(FOO, ">unwritable.txt"),
-              "Testing that we aren't running as a priviledged user, such as root")) {
+              "Testing that we aren't running as a privileged user, such as root")) {
           close FOO;
           skip "It's pointless to run the next test as root", 1;
       }
@@ -51,10 +61,10 @@ indir "rehash.$$" => sub {
 
 sub prepare {
     my @sourcefiles =
-        sort map { glob(top_file('certs', 'demo', "*.$_")) } ('pem',
-                                                              'crt',
-                                                              'cer',
-                                                              'crl');
+        sort map { glob(bldtop_file('certs', 'demo', "*.$_")) } ('pem',
+                                                                 'crt',
+                                                                 'cer',
+                                                                 'crl');
     my @destfiles = ();
     foreach (@sourcefiles) {
         copy($_, curdir());