Stop using stunnel.pm, we pass in the path from the main script instead.

Also made it easier to stop the test suite with control-c.

1 files changed, 6 insertions, 7 deletions

diff --git a/tests/httpsserver.pl b/tests/httpsserver.pl
index 10e32bf42..068f89e3e 100644
--- a/tests/httpsserver.pl
+++ b/tests/httpsserver.pl
@@ -7,19 +7,14 @@
 
 use strict;
 
-use stunnel;
-
-my $stunnel = &checkstunnel;
-
-if(!$stunnel) {
-    exit;
-}
+my $stunnel = "stunnel";
 
 #
 # -p pemfile
 # -P pid dir
 # -d listen port
 # -r target port
+# -s stunnel path
 
 my $verbose=0; # set to 1 for debugging
 
@@ -42,6 +37,10 @@ do {
         $target_port=$ARGV[1];
         shift @ARGV;
     }
+    elsif($ARGV[0] eq "-s") {
+        $stunnel=$ARGV[1];
+        shift @ARGV;
+    }
     elsif($ARGV[0] eq "-d") {
         $srcdir=$ARGV[1];
         shift @ARGV;