curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-15 16:42:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

runtests: move the UNIX sockets into $PIDDIR

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

Follow-up to 70d2fca2

Ref: #10818
This commit is contained in:
Dan Fandrich 2023-04-08 10:56:15 -07:00
parent 44677b6565
commit 89ede3953b
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/FILEFORMAT.md
View File

@ -134,7 +134,7 @@ Available substitute variables include:
- `%HTTPTLS6PORT` - IPv6 port number of the HTTP TLS server - `%HTTPTLS6PORT` - IPv6 port number of the HTTP TLS server
- `%HTTPTLSPORT` - 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 - `%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 - `%IMAP6PORT` - IPv6 port number of the IMAP server
- `%IMAPPORT` - Port number of the IMAP server - `%IMAPPORT` - Port number of the IMAP server
- `%LOGDIR` - Log directory relative to %PWD - `%LOGDIR` - Log directory relative to %PWD

3
tests/data/test1467
View File

@ -4,6 +4,7 @@
HTTP HTTP
HTTP GET HTTP GET
SOCKS5 SOCKS5
unix sockets
</keywords> </keywords>
</info> </info>
@ -41,7 +42,7 @@ socks5unix
HTTP GET via SOCKS5 proxy via unix sockets HTTP GET via SOCKS5 proxy via unix sockets
</name> </name>
<command> <command>
--socks5 localhost%SOCKSUNIXPATH http://%HOSTIP:%HTTPPORT/%TESTNUMBER --socks5 localhost%PWD/%SOCKSUNIXPATH http://%HOSTIP:%HTTPPORT/%TESTNUMBER
</command> </command>
</client> </client>

3
tests/data/test1468
View File

@ -5,6 +5,7 @@ HTTP
HTTP GET HTTP GET
SOCKS5 SOCKS5
SOCKS5h SOCKS5h
unix sockets
</keywords> </keywords>
</info> </info>
@ -42,7 +43,7 @@ socks5unix
HTTP GET with host name using SOCKS5h via unix sockets HTTP GET with host name using SOCKS5h via unix sockets
</name> </name>
<command> <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> </command>
</client> </client>

3
tests/data/test1470
View File

@ -6,6 +6,7 @@ HTTP
HTTP GET HTTP GET
SOCKS5 SOCKS5
SOCKS5h SOCKS5h
unix sockets
</keywords> </keywords>
</info> </info>
@ -44,7 +45,7 @@ socks5unix
HTTPS GET with host name using SOCKS5h via unix sockets HTTPS GET with host name using SOCKS5h via unix sockets
</name> </name>
<command> <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> </command>
</client> </client>

4
tests/runtests.pl
View File

@ -5980,8 +5980,8 @@ if ($gdbthis) {
} }
} }
$HTTPUNIXPATH = "http$$.sock"; # HTTP server Unix domain socket path $HTTPUNIXPATH = "$PIDDIR/http.sock"; # HTTP server Unix domain socket path
$SOCKSUNIXPATH = $pwd."/socks$$.sock"; # HTTP server Unix domain socket path, absolute path $SOCKSUNIXPATH = "$PIDDIR/socks.sock"; # SOCKS server Unix domain socket path
####################################################################### #######################################################################
# clear and create logging directory: # clear and create logging directory: