generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adapt some test recipes to the newer cmdstr()

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte
2016-04-01 15:09:28 +02:00
parent cb2ceb18f2
commit 25c78440d2
9 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/recipes/70-test_sslcertstatus.t
View File

@@ -72,7 +72,7 @@ plan skip_all => "$test_name needs the sock feature enabled"
$ENV{OPENSSL_ia32cap} = '~0x200000200000000'; $ENV{OPENSSL_ia32cap} = '~0x200000200000000';
my $proxy = TLSProxy::Proxy->new( my $proxy = TLSProxy::Proxy->new(
\&certstatus_filter, \&certstatus_filter,
cmdstr(app(["openssl"])), cmdstr(app(["openssl"]), display => 1),
srctop_file("apps", "server.pem"), srctop_file("apps", "server.pem"),
(!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE}) (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
); );

2
test/recipes/70-test_sslextension.t
View File

@@ -72,7 +72,7 @@ plan skip_all => "$test_name needs the sock feature enabled"
$ENV{OPENSSL_ia32cap} = '~0x200000200000000'; $ENV{OPENSSL_ia32cap} = '~0x200000200000000';
my $proxy = TLSProxy::Proxy->new( my $proxy = TLSProxy::Proxy->new(
\&extension_filter, \&extension_filter,
cmdstr(app(["openssl"])), cmdstr(app(["openssl"]), display => 1),
srctop_file("apps", "server.pem"), srctop_file("apps", "server.pem"),
(!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE}) (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
); );

2
test/recipes/70-test_sslsessiontick.t
View File

@@ -83,7 +83,7 @@ my $ticketseen = 0;
my $proxy = TLSProxy::Proxy->new( my $proxy = TLSProxy::Proxy->new(
undef, undef,
cmdstr(app(["openssl"])), cmdstr(app(["openssl"]), display => 1),
srctop_file("apps", "server.pem"), srctop_file("apps", "server.pem"),
(!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE}) (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
); );

2
test/recipes/70-test_sslskewith0p.t
View File

@@ -75,7 +75,7 @@ plan skip_all => "$test_name needs the sock feature enabled"
$ENV{OPENSSL_ia32cap} = '~0x200000200000000'; $ENV{OPENSSL_ia32cap} = '~0x200000200000000';
my $proxy = TLSProxy::Proxy->new( my $proxy = TLSProxy::Proxy->new(
\&ske_0_p_filter, \&ske_0_p_filter,
cmdstr(app(["openssl"])), cmdstr(app(["openssl"]), display => 1),
srctop_file("apps", "server.pem"), srctop_file("apps", "server.pem"),
(!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE}) (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
); );

2
test/recipes/70-test_sslvertol.t
View File

@@ -72,7 +72,7 @@ plan skip_all => "$test_name needs the sock feature enabled"
$ENV{OPENSSL_ia32cap} = '~0x200000200000000'; $ENV{OPENSSL_ia32cap} = '~0x200000200000000';
my $proxy = TLSProxy::Proxy->new( my $proxy = TLSProxy::Proxy->new(
\&vers_tolerance_filter, \&vers_tolerance_filter,
cmdstr(app(["openssl"])), cmdstr(app(["openssl"]), display => 1),
srctop_file("apps", "server.pem"), srctop_file("apps", "server.pem"),
(!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE}) (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
); );

2
test/recipes/70-test_tlsextms.t
View File

@@ -84,7 +84,7 @@ my $fullhand = 0;
my $proxy = TLSProxy::Proxy->new( my $proxy = TLSProxy::Proxy->new(
\&extms_filter, \&extms_filter,
cmdstr(app(["openssl"])), cmdstr(app(["openssl"]), display => 1),
srctop_file("apps", "server.pem"), srctop_file("apps", "server.pem"),
(!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE}) (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
); );

2
test/recipes/80-test_ca.t
View File

@@ -9,7 +9,7 @@ use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file/;
setup("test_ca"); setup("test_ca");
$ENV{OPENSSL} = cmdstr(app(["openssl"])); $ENV{OPENSSL} = cmdstr(app(["openssl"]), display => 1);
my $std_openssl_cnf = my $std_openssl_cnf =
srctop_file("apps", $^O eq "VMS" ? "openssl-vms.cnf" : "openssl.cnf"); srctop_file("apps", $^O eq "VMS" ? "openssl-vms.cnf" : "openssl.cnf");

2
test/recipes/80-test_tsa.t
View File

@@ -79,7 +79,7 @@ indir "tsa" => sub
$ENV{OPENSSL_CONF} = srctop_file("test", "CAtsa.cnf"); $ENV{OPENSSL_CONF} = srctop_file("test", "CAtsa.cnf");
# Because that's what ../apps/CA.pl really looks at # Because that's what ../apps/CA.pl really looks at
$ENV{OPENSSL_CONFIG} = "-config ".$ENV{OPENSSL_CONF}; $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"); $testtsa = srctop_file("test", "recipes", "80-test_tsa.t");
$CAtsa = srctop_file("test", "CAtsa.cnf"); $CAtsa = srctop_file("test", "CAtsa.cnf");

2
test/recipes/90-test_networking.t
View File

@@ -73,7 +73,7 @@ $ENV{OPENSSL_ia32cap} = '~0x200000200000000';
my $proxy = TLSProxy::Proxy->new( my $proxy = TLSProxy::Proxy->new(
undef, undef,
cmdstr(app(["openssl"])), cmdstr(app(["openssl"]), display => 1),
srctop_file("apps", "server.pem"), srctop_file("apps", "server.pem"),
(!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE}) (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE})
); );