Testing symbol presence: also take note of small objects

[oweals/openssl.git] / test / recipes / 25-test_gen.t

diff --git a/test/recipes/25-test_gen.t b/test/recipes/25-test_gen.t
index 2f50ee4cb30b83ee9da11ccc6017cfb460ae6244..6eac7cab499fcaff57bec56b5e30cec3e57ed55d 100644 (file)
--- a/test/recipes/25-test_gen.t
+++ b/test/recipes/25-test_gen.t
@@ -1,11 +1,18 @@
-#! /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;
 
 use File::Spec;
-use Test::More;
-use OpenSSL::Test qw/:DEFAULT top_file/;
+use OpenSSL::Test qw/:DEFAULT srctop_file/;
+use OpenSSL::Test::Utils;
 
 setup("test_gen");
 
@@ -13,7 +20,7 @@ plan tests => 1;
 
 my $T = "testcert";
 my $KEY = 512;
-my $CA = top_file("certs", "testca.pem");
+my $CA = srctop_file("certs", "testca.pem");
 
 unlink "$T.1", "$T.2", "$T.key";
 open RND, ">>", ".rnd";
@@ -22,8 +29,8 @@ close RND;
 
 subtest "generating certificate requests" => sub {
     my @req_new;
-    if (run(app(["openssl", "no-rsa"], stdout => undef))) {
-       @req_new = ("-newkey", "dsa:".top_file("apps", "dsa512.pem"));
+    if (disabled("rsa")) {
+       @req_new = ("-newkey", "dsa:".srctop_file("apps", "dsa512.pem"));
     } else {
        @req_new = ("-new");
        note("There should be a 2 sequences of .'s and some +'s.");
@@ -34,11 +41,11 @@ subtest "generating certificate requests" => sub {
 
     plan tests => 2;
 
-    ok(run(app(["openssl", "req", "-config", top_file("test", "test.cnf"),
+    ok(run(app(["openssl", "req", "-config", srctop_file("test", "test.cnf"),
                @req_new, "-out", "testreq.pem"])),
        "Generating request");
 
-    ok(run(app(["openssl", "req", "-config", top_file("test", "test.cnf"),
+    ok(run(app(["openssl", "req", "-config", srctop_file("test", "test.cnf"),
                "-verify", "-in", "testreq.pem", "-noout"])),
        "Verifying signature on request");
 };