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

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

diff --git a/test/recipes/15-test_ec.t b/test/recipes/15-test_ec.t
index bbda19af36ee3719503ae88046ddce3eb9e7b968..a1c704a3f08bf7359f0aebe4ffb8ddaf73ee48cb 100644 (file)
--- a/test/recipes/15-test_ec.t
+++ b/test/recipes/15-test_ec.t
@@ -1,30 +1,38 @@
-#! /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 OpenSSL::Test qw/:DEFAULT top_file/;
+use OpenSSL::Test qw/:DEFAULT srctop_file/;
+use OpenSSL::Test::Utils;
 
 setup("test_ec");
 
 plan tests => 5;
 
-require_ok(top_file('test','recipes','tconversion.pl'));
+require_ok(srctop_file('test','recipes','tconversion.pl'));
 
 ok(run(test(["ectest"])), "running ectest");
 
  SKIP: {
      skip "Skipping ec conversion test", 3
-        if run(app(["openssl","no-ec"], stdout => undef));
+        if disabled("ec");
 
      subtest 'ec conversions -- private key' => sub {
-        tconversion("ec", top_file("test","testec-p256.pem"));
+        tconversion("ec", srctop_file("test","testec-p256.pem"));
      };
      subtest 'ec conversions -- private key PKCS#8' => sub {
-        tconversion("ec", top_file("test","testec-p256.pem"), "pkey");
+        tconversion("ec", srctop_file("test","testec-p256.pem"), "pkey");
      };
      subtest 'ec conversions -- public key' => sub {
-        tconversion("ec", top_file("test","testecpub-p256.pem"), "ec", "-pubin", "-pubout");
+        tconversion("ec", srctop_file("test","testecpub-p256.pem"), "ec", "-pubin", "-pubout");
      };
 }