summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-04-01 15:09:28 +0200
committerRichard Levitte <levitte@openssl.org>2016-04-02 23:13:42 +0200
commit25c78440d21c814705e0e50c6e567300936aa02b (patch)
tree378816274644fa1f5ffabbf7520a2138448ddb58 /test
parentcb2ceb18f242bbc573c0e332f34b9ca42fc5f561 (diff)
Adapt some test recipes to the newer cmdstr()
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test')
-rwxr-xr-xtest/recipes/70-test_sslcertstatus.t2
-rwxr-xr-xtest/recipes/70-test_sslextension.t2
-rwxr-xr-xtest/recipes/70-test_sslsessiontick.t2
-rwxr-xr-xtest/recipes/70-test_sslskewith0p.t2
-rwxr-xr-xtest/recipes/70-test_sslvertol.t2
-rw-r--r--test/recipes/70-test_tlsextms.t2
-rw-r--r--test/recipes/80-test_ca.t2
-rw-r--r--test/recipes/80-test_tsa.t2
-rw-r--r--test/recipes/90-test_networking.t2
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})
);