Skip to content

Commit 57add48

Browse files
committed
Revert "Make socket path shorter for ext/sockets/tests/socket_cmsg_{rights|credentials}.phpt"
This reverts commit b0c1773, since this causes CI failures, apparently related to ZTS builds.
1 parent 8e2c08c commit 57add48

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

ext/sockets/tests/socket_cmsg_credentials.phpt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ die('skip SO_PASSCRED is not defined');
1616
}
1717
--FILE--
1818
<?php
19-
chdir(__DIR__);
20-
include "./mcast_helpers.php.inc";
21-
$path = "./socket_cmsg_credentials.sock";
19+
include __DIR__."/mcast_helpers.php.inc";
20+
$path = __DIR__ . "/socket_cmsg_credentials.sock";
2221

2322
@unlink($path);
2423

@@ -56,8 +55,7 @@ var_dump($data['control'][0]['data']['pid'] === $pid);
5655
?>
5756
--CLEAN--
5857
<?php
59-
chdir(__DIR__);
60-
$path = "./socket_cmsg_credentials.sock";
58+
$path = __DIR__ . "/socket_cmsg_credentials.sock";
6159
@unlink($path);
6260
--EXPECTF--
6361
creating send socket

ext/sockets/tests/socket_cmsg_rights.phpt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@ die('skip not for AIX');
1313
}
1414
--CLEAN--
1515
<?php
16-
chdir(__DIR__);
17-
$path = "./socket_cmsg_rights.sock";
16+
$path = __DIR__ . "/socket_cmsg_rights.sock";
1817
@unlink($path);
1918
--FILE--
2019
<?php
21-
chdir(__DIR__);
22-
include "./mcast_helpers.php.inc";
23-
$path = "./socket_cmsg_rights.sock";
20+
include __DIR__."/mcast_helpers.php.inc";
21+
$path = __DIR__ . "/socket_cmsg_rights.sock";
2422

2523
@unlink($path);
2624

0 commit comments

Comments
 (0)