aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2017-05-07 15:02:02 +0200
committerDan Fandrich <dan@coneharvesters.com>2017-05-08 22:59:12 +0200
commit9e9509e46a9db909e4c0a2ce0ac1ef5c94fcb3a4 (patch)
tree4dc96eefb5a673f8ae45cde776c6778b154a50a8 /tests
parentdc1a1b50557ed0cad427e0b5808a95459443ca41 (diff)
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.
Diffstat (limited to 'tests')
-rw-r--r--tests/.gitignore3
-rwxr-xr-xtests/secureserver.pl2
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/.gitignore b/tests/.gitignore
index 89f17d26a..fbbc16485 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 1d05e9a4c..c897ee5f1 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");