From 25c78440d21c814705e0e50c6e567300936aa02b Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 1 Apr 2016 15:09:28 +0200 Subject: [PATCH] Adapt some test recipes to the newer cmdstr() Reviewed-by: Rich Salz --- test/recipes/70-test_sslcertstatus.t | 2 +- test/recipes/70-test_sslextension.t | 2 +- test/recipes/70-test_sslsessiontick.t | 2 +- test/recipes/70-test_sslskewith0p.t | 2 +- test/recipes/70-test_sslvertol.t | 2 +- test/recipes/70-test_tlsextms.t | 2 +- test/recipes/80-test_ca.t | 2 +- test/recipes/80-test_tsa.t | 2 +- test/recipes/90-test_networking.t | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/recipes/70-test_sslcertstatus.t b/test/recipes/70-test_sslcertstatus.t index 48014e2af3..d2bc280770 100755 --- a/test/recipes/70-test_sslcertstatus.t +++ b/test/recipes/70-test_sslcertstatus.t @@ -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}) ); diff --git a/test/recipes/70-test_sslextension.t b/test/recipes/70-test_sslextension.t index 92c6762ffc..7d45ce26a3 100755 --- a/test/recipes/70-test_sslextension.t +++ b/test/recipes/70-test_sslextension.t @@ -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}) ); diff --git a/test/recipes/70-test_sslsessiontick.t b/test/recipes/70-test_sslsessiontick.t index 704573881c..cbd4c65f71 100755 --- a/test/recipes/70-test_sslsessiontick.t +++ b/test/recipes/70-test_sslsessiontick.t @@ -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}) ); diff --git a/test/recipes/70-test_sslskewith0p.t b/test/recipes/70-test_sslskewith0p.t index 0bed4bffbb..ac88ed524e 100755 --- a/test/recipes/70-test_sslskewith0p.t +++ b/test/recipes/70-test_sslskewith0p.t @@ -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}) ); diff --git a/test/recipes/70-test_sslvertol.t b/test/recipes/70-test_sslvertol.t index a3285a67dd..c1ec38fc35 100755 --- a/test/recipes/70-test_sslvertol.t +++ b/test/recipes/70-test_sslvertol.t @@ -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}) ); diff --git a/test/recipes/70-test_tlsextms.t b/test/recipes/70-test_tlsextms.t index 5c41a908a2..24abfcf321 100644 --- a/test/recipes/70-test_tlsextms.t +++ b/test/recipes/70-test_tlsextms.t @@ -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}) ); diff --git a/test/recipes/80-test_ca.t b/test/recipes/80-test_ca.t index 983f8ce1b2..09d5ba6dc3 100644 --- a/test/recipes/80-test_ca.t +++ b/test/recipes/80-test_ca.t @@ -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"); diff --git a/test/recipes/80-test_tsa.t b/test/recipes/80-test_tsa.t index 6785698c50..f2ceeeb9b7 100644 --- a/test/recipes/80-test_tsa.t +++ b/test/recipes/80-test_tsa.t @@ -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"); diff --git a/test/recipes/90-test_networking.t b/test/recipes/90-test_networking.t index 408d89af6a..85de81a6b5 100644 --- a/test/recipes/90-test_networking.t +++ b/test/recipes/90-test_networking.t @@ -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}) ); -- 2.25.1