Commit 25c78440 authored by Richard Levitte's avatar Richard Levitte
Browse files

Adapt some test recipes to the newer cmdstr() 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent cb2ceb18

test/recipes/70-test_sslcertstatus.t

+1 −1
Original line number Original line Diff line number Diff line
@@ -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})

);

);

test/recipes/70-test_sslextension.t

+1 −1
Original line number Original line Diff line number Diff line
@@ -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})

);

);

test/recipes/70-test_sslsessiontick.t

+1 −1
Original line number Original line Diff line number Diff line
@@ -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})

);

);

test/recipes/70-test_sslskewith0p.t

+1 −1
Original line number Original line Diff line number Diff line
@@ -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})

);

);

test/recipes/70-test_sslvertol.t

+1 −1
Original line number Original line Diff line number Diff line
@@ -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})

);

);