From: Dan Fandrich <dan@coneharvesters.com>
Date: Sun, 7 May 2017 13:02:02 +0000 (+0200)
Subject: tests: give each stunnel.conf file a unique name
X-Git-Tag: curl-7_54_1~138
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e9509e46a9db909e4c0a2ce0ac1ef5c94fcb3a4;p=thirdparty%2Fcurl.git

tests: give each stunnel.conf file a unique name

Otherwise, subsequent uses of stunnel overwrite the configuration file
of previous invocations so they can no longer be inspected.
---

diff --git a/tests/.gitignore b/tests/.gitignore
index 89f17d26ad..fbbc164857 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -10,9 +10,10 @@ curl_sftp_cmds
 curl_sftp_config
 curl_ssh_config
 curl_sshd_config
+ftps_stunnel.conf
+https_stunnel.conf
 log
 runtests.html
 runtests.pdf
-stunnel.conf
 testcurl.html
 testcurl.pdf
diff --git a/tests/secureserver.pl b/tests/secureserver.pl
index 1d05e9a4cd..c897ee5f1c 100755
--- a/tests/secureserver.pl
+++ b/tests/secureserver.pl
@@ -181,7 +181,7 @@ if(!$logfile) {
     $logfile = server_logfilename($logdir, $proto, $ipvnum, $idnum);
 }
 
-$conffile = "$path/stunnel.conf";
+$conffile = "$path/${proto}_stunnel.conf";
 
 $capath = abs_path($path);
 $certfile = "$srcdir/". ($stuncert?"certs/$stuncert":"stunnel.pem");