From: Richard Levitte Date: Fri, 12 Feb 2016 17:26:16 +0000 (+0100) Subject: Let all TLSProxy based tests display debug text conditionally X-Git-Tag: OpenSSL_1_1_0-pre3~62 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b44b935e3966ac03c581e267e9a99547f91dcb78;p=oweals%2Fopenssl.git Let all TLSProxy based tests display debug text conditionally If the environment variable HARNESS_ACTIVE isn't defined or HARNESS_VERBOSE is defined, it's probable that lots of output is desired. Reviewed-by: Rich Salz --- diff --git a/test/recipes/70-test_sslcertstatus.t b/test/recipes/70-test_sslcertstatus.t index a7f2d8a2b1..9a0c5f8eac 100755 --- a/test/recipes/70-test_sslcertstatus.t +++ b/test/recipes/70-test_sslcertstatus.t @@ -74,7 +74,8 @@ $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; my $proxy = TLSProxy::Proxy->new( \&certstatus_filter, cmdstr(app(["openssl"])), - srctop_file("apps", "server.pem") + srctop_file("apps", "server.pem"), + (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE}) ); plan tests => 1; diff --git a/test/recipes/70-test_sslextension.t b/test/recipes/70-test_sslextension.t index f7ac9f4d58..4582c5c720 100755 --- a/test/recipes/70-test_sslextension.t +++ b/test/recipes/70-test_sslextension.t @@ -74,7 +74,8 @@ $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; my $proxy = TLSProxy::Proxy->new( \&extension_filter, cmdstr(app(["openssl"])), - srctop_file("apps", "server.pem") + srctop_file("apps", "server.pem"), + (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE}) ); plan tests => 1; diff --git a/test/recipes/70-test_sslsessiontick.t b/test/recipes/70-test_sslsessiontick.t index f2c00daece..8a361fd803 100755 --- a/test/recipes/70-test_sslsessiontick.t +++ b/test/recipes/70-test_sslsessiontick.t @@ -84,7 +84,8 @@ my $ticketseen = 0; my $proxy = TLSProxy::Proxy->new( undef, cmdstr(app(["openssl"])), - srctop_file("apps", "server.pem") + srctop_file("apps", "server.pem"), + (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE}) ); plan tests => 8; diff --git a/test/recipes/70-test_sslskewith0p.t b/test/recipes/70-test_sslskewith0p.t index 0e6a780404..fac1e8d148 100755 --- a/test/recipes/70-test_sslskewith0p.t +++ b/test/recipes/70-test_sslskewith0p.t @@ -77,7 +77,8 @@ $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; my $proxy = TLSProxy::Proxy->new( \&ske_0_p_filter, cmdstr(app(["openssl"])), - srctop_file("apps", "server.pem") + srctop_file("apps", "server.pem"), + (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE}) ); plan tests => 1; diff --git a/test/recipes/70-test_sslvertol.t b/test/recipes/70-test_sslvertol.t index b12abee876..e014d3f02d 100755 --- a/test/recipes/70-test_sslvertol.t +++ b/test/recipes/70-test_sslvertol.t @@ -74,7 +74,8 @@ $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; my $proxy = TLSProxy::Proxy->new( \&vers_tolerance_filter, cmdstr(app(["openssl"])), - srctop_file("apps", "server.pem") + srctop_file("apps", "server.pem"), + (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE}) ); plan tests => 2; diff --git a/test/recipes/70-test_tlsextms.t b/test/recipes/70-test_tlsextms.t index a4419f5d24..82cb85676d 100644 --- a/test/recipes/70-test_tlsextms.t +++ b/test/recipes/70-test_tlsextms.t @@ -87,7 +87,7 @@ my $proxy = TLSProxy::Proxy->new( \&extms_filter, cmdstr(app(["openssl"])), srctop_file("apps", "server.pem"), - 1 + (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE}) ); plan tests => 9; diff --git a/test/recipes/90-test_networking.t b/test/recipes/90-test_networking.t index 1e2d5fcd13..cf3b43aa50 100644 --- a/test/recipes/90-test_networking.t +++ b/test/recipes/90-test_networking.t @@ -75,7 +75,8 @@ $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; my $proxy = TLSProxy::Proxy->new( undef, cmdstr(app(["openssl"])), - srctop_file("apps", "server.pem") + srctop_file("apps", "server.pem"), + (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE}) ); plan tests => 2;