From d7ff107654acb5dc682773bb0b369a7e593056d8 Mon Sep 17 00:00:00 2001
From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 2 Nov 2015 16:43:28 +0800
Subject: [PATCH] Fixed bug #70540 (sapi/fpm/tests/008.phpt and 016.phpt should
be skipped on some platforms)
---
sapi/fpm/tests/008.phpt | 17 ++++++++++++++++-
sapi/fpm/tests/016.phpt | 19 +++++++++++++++++--
2 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/sapi/fpm/tests/008.phpt b/sapi/fpm/tests/008.phpt
index 60f1ea6ebd..732a717aad 100644
--- a/sapi/fpm/tests/008.phpt
+++ b/sapi/fpm/tests/008.phpt
@@ -1,7 +1,22 @@
--TEST--
FPM: Test multi pool (dynamic + ondemand + static) (bug #68423)
--SKIPIF--
-<?php include "skipif.inc"; ?>
+<?php
+include "skipif.inc";
+
+$cfg = <<<EOT
+[global]
+[poold_ondemand]
+listen=127.0.0.1:9000
+pm = ondemand
+pm.max_children = 2
+pm.process_idle_timeout = 10
+EOT;
+
+if (test_fpm_conf($cfg, $msg) == false) {
+ die("skip " . $msg);
+}
+?>
--FILE--
<?php
diff --git a/sapi/fpm/tests/016.phpt b/sapi/fpm/tests/016.phpt
index 1a9e8e7577..a5084f18f3 100644
--- a/sapi/fpm/tests/016.phpt
+++ b/sapi/fpm/tests/016.phpt
@@ -1,7 +1,22 @@
--TEST--
FPM: Test splited configuration and load order #68391
--SKIPIF--
-<?php include "skipif.inc"; ?>
+<?php
+include "skipif.inc";
+
+$cfg = <<<EOT
+[global]
+[poold_ondemand]
+listen=127.0.0.1:9000
+pm = ondemand
+pm.max_children = 2
+pm.process_idle_timeout = 10
+EOT;
+
+if (test_fpm_conf($cfg, $msg) == false) {
+ die("skip " . $msg);
+}
+?>
--FILE--
<?php
@@ -84,4 +99,4 @@ Done
unlink($name);
}
@rmdir($logdir);
-?>
\ No newline at end of file
+?>
--
2.40.0