Fix 80-test_ssl_old.t: only count the ciphers if there are any.

[openssl.git] / test / recipes / 15-test_dsa.t

diff --git a/test/recipes/15-test_dsa.t b/test/recipes/15-test_dsa.t
index 897e4480cb1e1b520be019d3c5b99e8964a0ce55..2fd236e875f4fbd09ff83ab255b5d06dd04f17a8 100644 (file)
--- a/test/recipes/15-test_dsa.t
+++ b/test/recipes/15-test_dsa.t
@@ -1,33 +1,40 @@
-#! /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_dsa");
 
 plan tests => 6;
 
-require_ok(top_file('test','recipes','tconversion.pl'));
+require_ok(srctop_file('test','recipes','tconversion.pl'));
 
 ok(run(test(["dsatest"])), "running dsatest");
 ok(run(test(["dsatest", "-app2_1"])), "running dsatest -app2_1");
 
  SKIP: {
      skip "Skipping dsa conversion test", 3
-        if run(app(["openssl","no-dsa"], stdout => undef));
+        if disabled("dsa");
 
      subtest 'dsa conversions -- private key' => sub {
-        tconversion("dsa", top_file("test","testdsa.pem"));
+        tconversion("dsa", srctop_file("test","testdsa.pem"));
      };
      subtest 'dsa conversions -- private key PKCS#8' => sub {
-        tconversion("dsa", top_file("test","testdsa.pem"), "pkey");
+        tconversion("dsa", srctop_file("test","testdsa.pem"), "pkey");
      };
      subtest 'dsa conversions -- public key' => sub {
-        tconversion("dsa", top_file("test","testdsapub.pem"), "dsa",
-                    "-pubin", "-pubout");
+        tconversion("msb", srctop_file("test","testdsapub.pem"), "dsa",
+                        "-pubin", "-pubout");
      };
 }