summaryrefslogtreecommitdiff
path: root/tests/basic
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-02-18 16:43:22 +0100
committerNikita Popov <nikita.ppv@gmail.com>2019-02-20 11:20:40 +0100
commitc0e15a3b7fef5b341eb96e0e888f180ba7a39570 (patch)
tree3f16d8690ce435b103b842604a62f297c9f04fe9 /tests/basic
parent0513d59ed33c3439b2fb52bc39feff18a2b5436a (diff)
downloadphp-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 'tests/basic')
-rw-r--r--tests/basic/bug67198.phpt2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/basic/bug67198.phpt b/tests/basic/bug67198.phpt
index 4c2322b6de..184916197b 100644
--- a/tests/basic/bug67198.phpt
+++ b/tests/basic/bug67198.phpt
@@ -2,6 +2,8 @@
php://input is empty when enable_post_data_reading=Off
--INI--
allow_url_fopen=1
+--CONFLICTS--
+server
--SKIPIF--
<?php
include __DIR__."/../../sapi/cli/tests/skipif.inc";