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 fb146dd12aef709fae3bcf30881302fddc48ccb4..08160faf068847db7ca8a5571f87ac77056fbc11 100644 (file)
--- 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);
 
 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"
 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';
 
 $ENV{OPENSSL_ENGINES} = bldtop_dir("engines");
 $ENV{OPENSSL_ia32cap} = '~0x200000200000000';