diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-26 12:12:23 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-26 12:12:23 +0200 |
| commit | eb17f996fbef9ee1ef6ccc633d2870ac967f3308 (patch) | |
| tree | 58a050240bb8846b62ebbff70dd95232d40704b6 /ext/sockets/tests | |
| parent | 083f5f2005e189076817368586abf49995d6ed06 (diff) | |
| parent | 0487bcfac763453b3a386fe808d3ad58683936c9 (diff) | |
| download | php-git-eb17f996fbef9ee1ef6ccc633d2870ac967f3308.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Avoid socket path clash in test
Diffstat (limited to 'ext/sockets/tests')
| -rw-r--r-- | ext/sockets/tests/socket_cmsg_credentials.phpt | 4 | ||||
| -rw-r--r-- | ext/sockets/tests/socket_cmsg_rights.phpt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/sockets/tests/socket_cmsg_credentials.phpt b/ext/sockets/tests/socket_cmsg_credentials.phpt index 31d7eb4799..f2b56018d6 100644 --- a/ext/sockets/tests/socket_cmsg_credentials.phpt +++ b/ext/sockets/tests/socket_cmsg_credentials.phpt @@ -16,12 +16,12 @@ die('skip SO_PASSCRED is not defined'); } --CLEAN-- <?php -$path = __DIR__ . "/unix_sock"; +$path = __DIR__ . "/socket_cmsg_credentials.sock"; @unlink($path); --FILE-- <?php include __DIR__."/mcast_helpers.php.inc"; -$path = __DIR__ . "/unix_sock"; +$path = __DIR__ . "/socket_cmsg_credentials.sock"; @unlink($path); diff --git a/ext/sockets/tests/socket_cmsg_rights.phpt b/ext/sockets/tests/socket_cmsg_rights.phpt index a77f493650..050186c482 100644 --- a/ext/sockets/tests/socket_cmsg_rights.phpt +++ b/ext/sockets/tests/socket_cmsg_rights.phpt @@ -13,12 +13,12 @@ die('skip not for AIX'); } --CLEAN-- <?php -$path = __DIR__ . "/unix_sock"; +$path = __DIR__ . "/socket_cmsg_rights.sock"; @unlink($path); --FILE-- <?php include __DIR__."/mcast_helpers.php.inc"; -$path = __DIR__ . "/unix_sock"; +$path = __DIR__ . "/socket_cmsg_rights.sock"; @unlink($path); |