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

[openssl.git] / test / recipes / tconversion.pl

diff --git a/test/recipes/tconversion.pl b/test/recipes/tconversion.pl
index 94039e932b255e93c3aa585ce0329f51761c95dc..1a308e20b87735fad088c98ef49e729644d0efff 100644 (file)
--- a/test/recipes/tconversion.pl
+++ b/test/recipes/tconversion.pl
@@ -1,22 +1,30 @@
-#! /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::Compare qw/compare_text/;
 use File::Copy;
 
 use strict;
 use warnings;
 
 use File::Compare qw/compare_text/;
 use File::Copy;

-use Test::More;

 use lib 'testlib';
 use lib 'testlib';

-use OpenSSL::Test qw/:DEFAULT top_file/;
+use OpenSSL::Test qw/:DEFAULT/;

 
 my %conversionforms = (
 
 my %conversionforms = (

+    # Default conversion forms.  Other series may be added with
+    # specific test types as key.

     "*"                => [ "d", "p" ],
     "*"                => [ "d", "p" ],

-    x509       => [ "d", "n", "p" ],
+    "msb"      => [ "d", "p", "msblob" ],

     );
 sub tconversion {
     my $testtype = shift;
     my $t = shift;
     );
 sub tconversion {
     my $testtype = shift;
     my $t = shift;

-    my @conversionforms = 
+    my @conversionforms =

        defined($conversionforms{$testtype}) ?
        @{$conversionforms{$testtype}} :
        @{$conversionforms{"*"}};
        defined($conversionforms{$testtype}) ?
        @{$conversionforms{$testtype}} :
        @{$conversionforms{"*"}};


@@ -53,8 +61,9 @@ sub tconversion {
          ok(run(app([@cmd,
                      "-in", "$testtype-fff.p",
                      "-inform", "p",
          ok(run(app([@cmd,
                      "-in", "$testtype-fff.p",
                      "-inform", "p",

-                     "-outform", $to],
-                    stdout => "$testtype-f.$to")), "p -> $to");
+                     "-out", "$testtype-f.$to",
+                     "-outform", $to])),
+            "p -> $to");

       }
 
       foreach my $to (@conversionforms) {
       }
 
       foreach my $to (@conversionforms) {


@@ -62,20 +71,21 @@ sub tconversion {
              ok(run(app([@cmd,
                          "-in", "$testtype-f.$from",
                          "-inform", $from,
              ok(run(app([@cmd,
                          "-in", "$testtype-f.$from",
                          "-inform", $from,

-                         "-outform", $to],
-                        stdout => "$testtype-ff.$from$to")), "$from -> $to");
+                         "-out", "$testtype-ff.$from$to",
+                         "-outform", $to])),
+                "$from -> $to");

          }
       }
 
       if ($testtype ne "p7d") {
          }
       }
 
       if ($testtype ne "p7d") {

-         is(compare_text("$testtype-fff.p", "$testtype-f.p"), 0,
+         is(cmp_text("$testtype-fff.p", "$testtype-f.p"), 0,

             'comparing orig to p');
       }
 
       foreach my $to (@conversionforms) {
          next if $to eq "d";
          foreach my $from (@conversionforms) {
             'comparing orig to p');
       }
 
       foreach my $to (@conversionforms) {
          next if $to eq "d";
          foreach my $from (@conversionforms) {

-             is(compare_text("$testtype-f.$to", "$testtype-ff.$from$to"), 0,
+             is(cmp_text("$testtype-f.$to", "$testtype-ff.$from$to"), 0,

                 "comparing $to to $from$to");
          }
       }
                 "comparing $to to $from$to");
          }
       }


@@ -85,4 +95,12 @@ sub tconversion {
     unlink glob "$testtype-fff.*";
 }
 
     unlink glob "$testtype-fff.*";
 }
 

+sub cmp_text {
+    return compare_text(@_, sub {
+        $_[0] =~ s/\R//g;
+        $_[1] =~ s/\R//g;
+        return $_[0] ne $_[1];
+    });
+}
+

 1;
 1;