[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  6b33d10686993191a99ad758cb59fb89c3d7abda (commit)
      from  ce249fac5770acf9d92f13a223d83f88a7ea56c1 (commit)


- Log -----------------------------------------------------------------
commit 6b33d10686993191a99ad758cb59fb89c3d7abda
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Sep 7 16:26:04 2015 +0200

    Adjust the verify_extra test recipe to its executable
    
    The verify_extra_test was recently changed to take its parameters as
    arguments instead of having them hardcoded.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 test/recipes/70-test_verify_extra.t | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/test/recipes/70-test_verify_extra.t b/test/recipes/70-test_verify_extra.t
index 3ef4a27..eec8904 100644
--- a/test/recipes/70-test_verify_extra.t
+++ b/test/recipes/70-test_verify_extra.t
@@ -1,5 +1,12 @@
 #! /usr/bin/perl
 
-use OpenSSL::Test::Simple;
+use OpenSSL::Test qw/:DEFAULT top_file/;
 
-simple_test("test_verify_extra", "verify_extra_test");
+setup("test_verify_extra");
+
+plan tests => 1;
+
+ok(run(test(["verify_extra_test",
+             top_file("test", "certs", "roots.pem"),
+             top_file("test", "certs", "untrusted.pem"),
+             top_file("test", "certs", "bad.pem")])));