Don't break testing when runnins as root

[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 b374e598d1c2039386294e2fcb27803ea00fd624..9e42742fba9a1a9467c90208092eb3eb7c0e74c0 100644 (file)
--- a/test/recipes/40-test_rehash.t
+++ b/test/recipes/40-test_rehash.t
@@ -13,7 +13,7 @@ use warnings;
 use File::Spec::Functions;
 use File::Copy;
 use File::Basename;
 use File::Spec::Functions;
 use File::Copy;
 use File::Basename;

-use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/;
+use OpenSSL::Glob;

 use OpenSSL::Test qw/:DEFAULT srctop_file/;
 
 setup("test_rehash");
 use OpenSSL::Test qw/:DEFAULT srctop_file/;
 
 setup("test_rehash");


@@ -23,7 +23,7 @@ setup("test_rehash");
 plan skip_all => "test_rehash is not available on this platform"
     unless run(app(["openssl", "rehash", "-help"]));
 
 plan skip_all => "test_rehash is not available on this platform"
     unless run(app(["openssl", "rehash", "-help"]));
 

-plan tests => 5;
+plan tests => 4;

 
 indir "rehash.$$" => sub {
     prepare();
 
 indir "rehash.$$" => sub {
     prepare();


@@ -46,8 +46,7 @@ indir "rehash.$$" => sub {
     prepare();
     chmod 0500, curdir();
   SKIP: {
     prepare();
     chmod 0500, curdir();
   SKIP: {

-      if (!ok(!open(FOO, ">unwritable.txt"),
-              "Testing that we aren't running as a privileged user, such as root")) {
+      if (open(FOO, ">unwritable.txt")) {

           close FOO;
           skip "It's pointless to run the next test as root", 1;
       }
           close FOO;
           skip "It's pointless to run the next test as root", 1;
       }