Skip to content

sapi: Fixes flaky cli server tests #23238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NickSdot wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −3
Open

sapi: Fixes flaky cli server tests #23238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sapi/cli/tests/php_cli_server.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ function php_cli_server_start(
$php_executable = getenv('TEST_PHP_EXECUTABLE') ?: PHP_BINARY;
$error = null;

// Create dedicated doc root to avoid index.php clashes between tests.
$doc_root = __DIR__ . DIRECTORY_SEPARATOR . basename($_SERVER['PHP_SELF'], '.php');
// Create dedicated doc root to avoid index.php clashes between processes.
$doc_root = __DIR__ . DIRECTORY_SEPARATOR . basename($_SERVER['PHP_SELF'], '.php') . '-' . getmypid();
@mkdir($doc_root);

if ($code) {
Expand Down
2 changes: 1 addition & 1 deletion sapi/cli/tests/php_cli_server_002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ php_cli_server_start('var_dump($_SERVER["DOCUMENT_ROOT"], $_SERVER["SERVER_SOFTW
var_dump(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS));
?>
--EXPECTF--
string(%d) "string(%d) "%sphp_cli_server_002"
string(%d) "string(%d) "%sphp_cli_server_002-%d"
string(%d) "PHP/%s (Development Server)"
string(%d) "localhost"
string(%d) "%s"
Expand Down
Loading