mirror of
https://github.com/openssl/openssl.git
synced 2025-01-12 13:36:28 +08:00
b40498c6e7
In the interest of finding out what went wrong with a test by looking at its output, tconversion.pl is modified to take arguments in option form, and gets an additional -prefix option that callers can use to ensure output files are uniquely named. Test recipes are modified to use these new options. Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/13147)
112 lines
3.0 KiB
Perl
112 lines
3.0 KiB
Perl
#! /usr/bin/env perl
|
|
# Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License 2.0 (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 OpenSSL::Test qw/:DEFAULT/;
|
|
|
|
my %conversionforms = (
|
|
# Default conversion forms. Other series may be added with
|
|
# specific test types as key.
|
|
"*" => [ "d", "p" ],
|
|
"msb" => [ "d", "p", "msblob" ],
|
|
);
|
|
sub tconversion {
|
|
my %opts = @_;
|
|
|
|
die "Missing option -type" unless $opts{-type};
|
|
die "Missing option -in" unless $opts{-in};
|
|
my $testtype = $opts{-type};
|
|
my $t = $opts{-in};
|
|
my $prefix = $opts{-prefix} // $testtype;
|
|
my @conversionforms =
|
|
defined($conversionforms{$testtype}) ?
|
|
@{$conversionforms{$testtype}} :
|
|
@{$conversionforms{"*"}};
|
|
my @openssl_args;
|
|
if (defined $opts{-args}) {
|
|
@openssl_args = @{$opts{-args}} if ref $opts{-args} eq 'ARRAY';
|
|
@openssl_args = ($opts{-args}) if ref $opts{-args} eq '';
|
|
}
|
|
@openssl_args = ($testtype) unless @openssl_args;
|
|
|
|
my $n = scalar @conversionforms;
|
|
my $totaltests =
|
|
1 # for initializing
|
|
+ $n # initial conversions from p to all forms (A)
|
|
+ $n*$n # conversion from result of A to all forms (B)
|
|
+ 1 # comparing original test file to p form of A
|
|
+ $n*($n-1); # comparing first conversion to each fom in A with B
|
|
$totaltests-- if ($testtype eq "p7d"); # no comparison of original test file
|
|
plan tests => $totaltests;
|
|
|
|
my @cmd = ("openssl", @openssl_args);
|
|
|
|
my $init;
|
|
if (scalar @openssl_args > 0 && $openssl_args[0] eq "pkey") {
|
|
$init = ok(run(app([@cmd, "-in", $t, "-out", "$prefix-fff.p"])),
|
|
'initializing');
|
|
} else {
|
|
$init = ok(copy($t, "$prefix-fff.p"), 'initializing');
|
|
}
|
|
if (!$init) {
|
|
diag("Trying to copy $t to $prefix-fff.p : $!");
|
|
}
|
|
|
|
SKIP: {
|
|
skip "Not initialized, skipping...", 22 unless $init;
|
|
|
|
foreach my $to (@conversionforms) {
|
|
ok(run(app([@cmd,
|
|
"-in", "$prefix-fff.p",
|
|
"-inform", "p",
|
|
"-out", "$prefix-f.$to",
|
|
"-outform", $to])),
|
|
"p -> $to");
|
|
}
|
|
|
|
foreach my $to (@conversionforms) {
|
|
foreach my $from (@conversionforms) {
|
|
ok(run(app([@cmd,
|
|
"-in", "$prefix-f.$from",
|
|
"-inform", $from,
|
|
"-out", "$prefix-ff.$from$to",
|
|
"-outform", $to])),
|
|
"$from -> $to");
|
|
}
|
|
}
|
|
|
|
if ($testtype ne "p7d") {
|
|
is(cmp_text("$prefix-fff.p", "$prefix-f.p"), 0,
|
|
'comparing orig to p');
|
|
}
|
|
|
|
foreach my $to (@conversionforms) {
|
|
next if $to eq "d";
|
|
foreach my $from (@conversionforms) {
|
|
is(cmp_text("$prefix-f.$to", "$prefix-ff.$from$to"), 0,
|
|
"comparing $to to $from$to");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
sub cmp_text {
|
|
return compare_text(@_, sub {
|
|
$_[0] =~ s/\R//g;
|
|
$_[1] =~ s/\R//g;
|
|
return $_[0] ne $_[1];
|
|
});
|
|
}
|
|
|
|
1;
|