mirror of
https://github.com/openssl/openssl.git
synced 2024-11-21 01:15:20 +08:00
Adapt some test recipes to the newer cmdstr()
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
parent
cb2ceb18f2
commit
25c78440d2
@ -72,7 +72,7 @@ plan skip_all => "$test_name needs the sock feature enabled"
|
||||
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
|
||||
my $proxy = TLSProxy::Proxy->new(
|
||||
\&certstatus_filter,
|
||||
cmdstr(app(["openssl"])),
|
||||
cmdstr(app(["openssl"]), display => 1),
|
||||
srctop_file("apps", "server.pem"),
|
||||
(!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
|
||||
);
|
||||
|
@ -72,7 +72,7 @@ plan skip_all => "$test_name needs the sock feature enabled"
|
||||
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
|
||||
my $proxy = TLSProxy::Proxy->new(
|
||||
\&extension_filter,
|
||||
cmdstr(app(["openssl"])),
|
||||
cmdstr(app(["openssl"]), display => 1),
|
||||
srctop_file("apps", "server.pem"),
|
||||
(!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
|
||||
);
|
||||
|
@ -83,7 +83,7 @@ my $ticketseen = 0;
|
||||
|
||||
my $proxy = TLSProxy::Proxy->new(
|
||||
undef,
|
||||
cmdstr(app(["openssl"])),
|
||||
cmdstr(app(["openssl"]), display => 1),
|
||||
srctop_file("apps", "server.pem"),
|
||||
(!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
|
||||
);
|
||||
|
@ -75,7 +75,7 @@ plan skip_all => "$test_name needs the sock feature enabled"
|
||||
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
|
||||
my $proxy = TLSProxy::Proxy->new(
|
||||
\&ske_0_p_filter,
|
||||
cmdstr(app(["openssl"])),
|
||||
cmdstr(app(["openssl"]), display => 1),
|
||||
srctop_file("apps", "server.pem"),
|
||||
(!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
|
||||
);
|
||||
|
@ -72,7 +72,7 @@ plan skip_all => "$test_name needs the sock feature enabled"
|
||||
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
|
||||
my $proxy = TLSProxy::Proxy->new(
|
||||
\&vers_tolerance_filter,
|
||||
cmdstr(app(["openssl"])),
|
||||
cmdstr(app(["openssl"]), display => 1),
|
||||
srctop_file("apps", "server.pem"),
|
||||
(!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
|
||||
);
|
||||
|
@ -84,7 +84,7 @@ my $fullhand = 0;
|
||||
|
||||
my $proxy = TLSProxy::Proxy->new(
|
||||
\&extms_filter,
|
||||
cmdstr(app(["openssl"])),
|
||||
cmdstr(app(["openssl"]), display => 1),
|
||||
srctop_file("apps", "server.pem"),
|
||||
(!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
|
||||
);
|
||||
|
@ -9,7 +9,7 @@ use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file/;
|
||||
|
||||
setup("test_ca");
|
||||
|
||||
$ENV{OPENSSL} = cmdstr(app(["openssl"]));
|
||||
$ENV{OPENSSL} = cmdstr(app(["openssl"]), display => 1);
|
||||
my $std_openssl_cnf =
|
||||
srctop_file("apps", $^O eq "VMS" ? "openssl-vms.cnf" : "openssl.cnf");
|
||||
|
||||
|
@ -79,7 +79,7 @@ indir "tsa" => sub
|
||||
$ENV{OPENSSL_CONF} = srctop_file("test", "CAtsa.cnf");
|
||||
# Because that's what ../apps/CA.pl really looks at
|
||||
$ENV{OPENSSL_CONFIG} = "-config ".$ENV{OPENSSL_CONF};
|
||||
$ENV{OPENSSL} = cmdstr(app(["openssl"]));
|
||||
$ENV{OPENSSL} = cmdstr(app(["openssl"]), display => 1);
|
||||
$testtsa = srctop_file("test", "recipes", "80-test_tsa.t");
|
||||
$CAtsa = srctop_file("test", "CAtsa.cnf");
|
||||
|
||||
|
@ -73,7 +73,7 @@ $ENV{OPENSSL_ia32cap} = '~0x200000200000000';
|
||||
|
||||
my $proxy = TLSProxy::Proxy->new(
|
||||
undef,
|
||||
cmdstr(app(["openssl"])),
|
||||
cmdstr(app(["openssl"]), display => 1),
|
||||
srctop_file("apps", "server.pem"),
|
||||
(!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
|
||||
);
|
||||
|
Loading…
Reference in New Issue
Block a user