diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-18 16:43:22 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-20 11:20:40 +0100 |
| commit | c0e15a3b7fef5b341eb96e0e888f180ba7a39570 (patch) | |
| tree | 3f16d8690ce435b103b842604a62f297c9f04fe9 /ext/standard/tests/streams/bug64433.phpt | |
| parent | 0513d59ed33c3439b2fb52bc39feff18a2b5436a (diff) | |
| download | php-git-c0e15a3b7fef5b341eb96e0e888f180ba7a39570.tar.gz | |
Implement fine-grained conflict handling
Tests can specify conflict keys, either in --CONFLICTS-- or
a per-directory CONFLICTS file. Non-conflicting tests may be run
in parallel.
Diffstat (limited to 'ext/standard/tests/streams/bug64433.phpt')
| -rw-r--r-- | ext/standard/tests/streams/bug64433.phpt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/standard/tests/streams/bug64433.phpt b/ext/standard/tests/streams/bug64433.phpt index 1fbc049960..897947f453 100644 --- a/ext/standard/tests/streams/bug64433.phpt +++ b/ext/standard/tests/streams/bug64433.phpt @@ -9,6 +9,8 @@ if(!$res) { die("skip could not open cli server script"); } ?> +--CONFLICTS-- +server --FILE-- <?php include dirname(__FILE__)."/../../../../sapi/cli/tests/php_cli_server.inc"; |