Fixed bug #70540 (sapi/fpm/tests/008.phpt and 016.phpt should be skipped on some...

diff --git a/sapi/fpm/tests/008.phpt b/sapi/fpm/tests/008.phpt
index 60f1ea6ebda5bf3c64250a8198d9fa998a0afa0c..732a717aad851e9e76aef2b3a5048f5b6a9089c3 100644 (file)
--- 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 1a9e8e7577ee35848055aff3135363b05d7de9c4..a5084f18f3e707abaff15a7a70567e274d04f438 100644 (file)
--- 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
+?>