From c0e15a3b7fef5b341eb96e0e888f180ba7a39570 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 18 Feb 2019 16:43:22 +0100
Subject: 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.
---
 tests/basic/bug67198.phpt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tests/basic')

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";
-- 
cgit v1.2.1