runtests: move the UNIX sockets into $PIDDIR

These were missed when the other server files were moved there.

Follow-up to 70d2fca2

Ref: #10818

diff --git a/tests/FILEFORMAT.md b/tests/FILEFORMAT.md
index 72ae5c18dbc99dd89aa58e11db93a549bac121e3..cf0ab99f4f99ef59f93f2ea6f6843ffeafacd6ad 100644 (file)
--- a/tests/FILEFORMAT.md
+++ b/tests/FILEFORMAT.md
@@ -134,7 +134,7 @@ Available substitute variables include:
 - `%HTTPTLS6PORT` - IPv6 port number of the HTTP TLS server
 - `%HTTPTLSPORT` - Port number of the HTTP TLS server
 - `%HTTPUNIXPATH` - Path to the Unix socket of the HTTP server
-- `%SOCKSUNIXPATH` - Absolute Path to the Unix socket of the SOCKS server
+- `%SOCKSUNIXPATH` - Path to the Unix socket of the SOCKS server
 - `%IMAP6PORT` - IPv6 port number of the IMAP server
 - `%IMAPPORT` - Port number of the IMAP server
 - `%LOGDIR` - Log directory relative to %PWD

diff --git a/tests/data/test1467 b/tests/data/test1467
index 1be4c2c769416b06521886f910b82648ad001a7b..4770504c7f577751753c0954e839f6bde2fd969f 100644 (file)
--- a/tests/data/test1467
+++ b/tests/data/test1467
@@ -4,6 +4,7 @@
 HTTP
 HTTP GET
 SOCKS5
+unix sockets
 </keywords>
 </info>
 
@@ -41,7 +42,7 @@ socks5unix
 HTTP GET via SOCKS5 proxy via unix sockets
  </name>
  <command>
---socks5 localhost%SOCKSUNIXPATH http://%HOSTIP:%HTTPPORT/%TESTNUMBER
+--socks5 localhost%PWD/%SOCKSUNIXPATH http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 

diff --git a/tests/data/test1468 b/tests/data/test1468
index 1ff6ada4dbf515416dc88e88ceec3064e6e21462..207990e9448bfc331eb0be499681107fd4830ef0 100644 (file)
--- a/tests/data/test1468
+++ b/tests/data/test1468
@@ -5,6 +5,7 @@ HTTP
 HTTP GET
 SOCKS5
 SOCKS5h
+unix sockets
 </keywords>
 </info>
 
@@ -42,7 +43,7 @@ socks5unix
 HTTP GET with host name using SOCKS5h via unix sockets
  </name>
  <command>
-http://this.is.a.host.name:%HTTPPORT/%TESTNUMBER --proxy socks5h://localhost%SOCKSUNIXPATH
+http://this.is.a.host.name:%HTTPPORT/%TESTNUMBER --proxy socks5h://localhost%PWD/%SOCKSUNIXPATH
 </command>
 </client>
 

diff --git a/tests/data/test1470 b/tests/data/test1470
index 7807a3dce801ee224f2c2c0ed75ec78d1a298260..bec54cfc0450b4447a9788a47ba1082e0df2445a 100644 (file)
--- a/tests/data/test1470
+++ b/tests/data/test1470
@@ -6,6 +6,7 @@ HTTP
 HTTP GET
 SOCKS5
 SOCKS5h
+unix sockets
 </keywords>
 </info>
 
@@ -44,7 +45,7 @@ socks5unix
 HTTPS GET with host name using SOCKS5h via unix sockets
  </name>
  <command>
-https://this.is.a.host.name:%HTTPSPORT/%TESTNUMBER -k --proxy socks5h://localhost%SOCKSUNIXPATH
+https://this.is.a.host.name:%HTTPSPORT/%TESTNUMBER -k --proxy socks5h://localhost%PWD/%SOCKSUNIXPATH
 </command>
 </client>
 

diff --git a/tests/runtests.pl b/tests/runtests.pl
index b4af9e25eed755201cd8535539f2c1c6bab8a725..8f926fa215d36876d4f5b46a054970de21f7c0c2 100755 (executable)
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -5980,8 +5980,8 @@ if ($gdbthis) {
     }
 }
 
-$HTTPUNIXPATH    = "http$$.sock"; # HTTP server Unix domain socket path
-$SOCKSUNIXPATH    = $pwd."/socks$$.sock"; # HTTP server Unix domain socket path, absolute path
+$HTTPUNIXPATH  = "$PIDDIR/http.sock";  # HTTP server Unix domain socket path
+$SOCKSUNIXPATH = "$PIDDIR/socks.sock"; # SOCKS server Unix domain socket path
 
 #######################################################################
 # clear and create logging directory: