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 89f17d26adba16707be36804e060a701c902aac7..fbbc164857286c470b993246b19d70efe3b4ffa1 100644 (file)
--- 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 1d05e9a4cd1edde2752b160d219dd040fede0125..c897ee5f1c67729d5000ce453ac756909bbedf03 100755 (executable)
--- 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");