[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  b15e62ecc5fc8f6c5b170b96480f13bf1b8e7915 (commit)
      from  1c5a2905c6d04cb69ca47078a4624ce4b6d5d540 (commit)


- Log -----------------------------------------------------------------
commit b15e62ecc5fc8f6c5b170b96480f13bf1b8e7915
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Jan 29 06:14:53 2018 +0100

    Don't break testing when runnins as root
    
    The rehash test broke the test if run by root.  Instead, just skip the
    check that requires non-root to be worth it.
    
    Fixes #4387
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5184)
    
    (cherry picked from commit 98ade24200f127a158b60bc736390c587cdd3dfb)

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

Summary of changes:
 test/recipes/40-test_rehash.t | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/recipes/40-test_rehash.t b/test/recipes/40-test_rehash.t
index 1204f1f..9e42742 100644
--- a/test/recipes/40-test_rehash.t
+++ b/test/recipes/40-test_rehash.t
@@ -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 tests => 5;
+plan tests => 4;
 
 indir "rehash.$$" => sub {
     prepare();
@@ -46,8 +46,7 @@ indir "rehash.$$" => sub {
     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;
       }