From: Richard Levitte <levitte@openssl.org>
Date: Tue, 9 Feb 2016 10:16:05 +0000 (+0100)
Subject: Update 90-test-networking.t to do the same checks as other TLSProxy tests
X-Git-Tag: OpenSSL_1_1_0-pre3~181
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=920def7401f0cd68a2040409c134af3f3db7453b

Update 90-test-networking.t to do the same checks as other TLSProxy tests

Reviewed-by: Andy Polyakov <appro@openssl.org>
---

diff --git a/test/recipes/90-test_networking.t b/test/recipes/90-test_networking.t
index fb146dd12a..08160faf06 100644
--- a/test/recipes/90-test_networking.t
+++ b/test/recipes/90-test_networking.t
@@ -59,10 +59,14 @@ use TLSProxy::Proxy;
 my $test_name = "test_networking";
 setup($test_name);
 
+plan skip_all => "TLSProxy isn't usable on $^O"
+    if $^O =~ /^VMS$/;
+
+plan skip_all => "$test_name needs the engine feature enabled"
+    if disabled("engine");
+
 plan skip_all => "$test_name can only be performed with OpenSSL configured shared"
-    unless (map { s/\R//; s/^SHARED_LIBS=\s*//; $_ }
-	    grep { /^SHARED_LIBS=/ }
-	    do { local @ARGV = ( bldtop_file("Makefile") ); <> })[0] ne "";
+    if disabled("shared");
 
 $ENV{OPENSSL_ENGINES} = bldtop_dir("engines");
 $ENV{OPENSSL_ia32cap} = '~0x200000200000000';