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

[openssl.git] / test / recipes / 80-test_ca.t

diff --git a/test/recipes/80-test_ca.t b/test/recipes/80-test_ca.t
index e9ff318ff31211892a134851c5e86296af293b89..f62d9d59ed764af790b004cea0ec71eaaf06ace0 100644 (file)
--- a/test/recipes/80-test_ca.t
+++ b/test/recipes/80-test_ca.t
@@ -13,6 +13,7 @@ use warnings;
 use POSIX;
 use File::Path 2.00 qw/rmtree/;
 use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file/;
+use OpenSSL::Test::Utils;
 
 setup("test_ca");
 
@@ -25,23 +26,26 @@ rmtree("demoCA", { safe => 0 });
 plan tests => 5;
  SKIP: {
      $ENV{OPENSSL_CONFIG} = '-config "'.srctop_file("test", "CAss.cnf").'"';
-     skip "failed creating CA structure", 3
+     skip "failed creating CA structure", 4
         if !ok(run(perlapp(["CA.pl","-newca"], stdin => undef)),
                'creating CA structure');
 
      $ENV{OPENSSL_CONFIG} = '-config "'.srctop_file("test", "Uss.cnf").'"';
-     skip "failed creating new certificate request", 2
+     skip "failed creating new certificate request", 3
         if !ok(run(perlapp(["CA.pl","-newreq"])),
                'creating certificate request');
 
      $ENV{OPENSSL_CONFIG} = '-config "'.$std_openssl_cnf.'"';
-     skip "failed to sign certificate request", 1
+     skip "failed to sign certificate request", 2
         if !is(yes(cmdstr(perlapp(["CA.pl", "-sign"]))), 0,
                'signing certificate request');
 
      ok(run(perlapp(["CA.pl", "-verify", "newcert.pem"])),
         'verifying new certificate');
 
+     skip "CT not configured, can't use -precert", 1
+         if disabled("ct");
+
      $ENV{OPENSSL_CONFIG} = "-config ".srctop_file("test", "Uss.cnf");
      ok(run(perlapp(["CA.pl", "-precert"], stderr => undef)),
         'creating new pre-certificate');