Merge branch 'PHP-5.6'

* PHP-5.6:
  simplify fpm tests

10 files changed, 16 insertions, 32 deletions

diff --git a/sapi/fpm/tests/002.phpt b/sapi/fpm/tests/002.phpt
index ce878661ea..89e431849a 100644
--- a/sapi/fpm/tests/002.phpt
+++ b/sapi/fpm/tests/002.phpt
@@ -24,8 +24,7 @@ EOT;
 
 $fpm = run_fpm($cfg, $tail);
 if (is_resource($fpm)) {
-    var_dump(fgets($tail));
-    var_dump(fgets($tail));
+    fpm_display_log($tail, 2);
     $i = 0;
     while (($i++ < 30) && !($fp = @fsockopen('127.0.0.1', $port))) {
         usleep(10000);
@@ -42,10 +41,8 @@ if (is_resource($fpm)) {
 
 ?>
 --EXPECTF--
-string(%d) "[%d-%s-%d %d:%d:%d] NOTICE: fpm is running, pid %d
-"
-string(%d) "[%d-%s-%d %d:%d:%d] NOTICE: ready to handle connections
-"
+[%d-%s-%d %d:%d:%d] NOTICE: fpm is running, pid %d
+[%d-%s-%d %d:%d:%d] NOTICE: ready to handle connections
 Done
 --CLEAN--
 <?php
diff --git a/sapi/fpm/tests/003.phpt b/sapi/fpm/tests/003.phpt
index 0ce1bd2828..f928626ecc 100644
--- a/sapi/fpm/tests/003.phpt
+++ b/sapi/fpm/tests/003.phpt
@@ -24,8 +24,7 @@ EOT;
 
 $fpm = run_fpm($cfg, $tail);
 if (is_resource($fpm)) {
-    var_dump(fgets($tail));
-    var_dump(fgets($tail));
+    fpm_display_log($tail, 2);
     $i = 0;
     while (($i++ < 30) && !($fp = fsockopen('[::1]', $port))) {
         usleep(10000);
@@ -42,10 +41,8 @@ if (is_resource($fpm)) {
 
 ?>
 --EXPECTF--
-string(%d) "[%d-%s-%d %d:%d:%d] NOTICE: fpm is running, pid %d
-"
-string(%d) "[%d-%s-%d %d:%d:%d] NOTICE: ready to handle connections
-"
+[%d-%s-%d %d:%d:%d] NOTICE: fpm is running, pid %d
+[%d-%s-%d %d:%d:%d] NOTICE: ready to handle connections
 Done
 --CLEAN--
 <?php
diff --git a/sapi/fpm/tests/004.phpt b/sapi/fpm/tests/004.phpt
index 0d39b1399b..2a4d666c64 100644
--- a/sapi/fpm/tests/004.phpt
+++ b/sapi/fpm/tests/004.phpt
@@ -24,8 +24,7 @@ EOT;
 
 $fpm = run_fpm($cfg, $tail);
 if (is_resource($fpm)) {
-    var_dump(fgets($tail));
-    var_dump(fgets($tail));
+    fpm_display_log($tail, 2);
     $i = 0;
     while (($i++ < 30) && !($fp = @fsockopen('127.0.0.1', $port))) {
         usleep(10000);
@@ -49,10 +48,8 @@ if (is_resource($fpm)) {
 
 ?>
 --EXPECTF--
-string(%d) "[%d-%s-%d %d:%d:%d] NOTICE: fpm is running, pid %d
-"
-string(%d) "[%d-%s-%d %d:%d:%d] NOTICE: ready to handle connections
-"
+[%d-%s-%d %d:%d:%d] NOTICE: fpm is running, pid %d
+[%d-%s-%d %d:%d:%d] NOTICE: ready to handle connections
 Done IPv4
 Done IPv6
 --CLEAN--
diff --git a/sapi/fpm/tests/005.phpt b/sapi/fpm/tests/005.phpt
index 992b01f08e..c565c2a9eb 100644
--- a/sapi/fpm/tests/005.phpt
+++ b/sapi/fpm/tests/005.phpt
@@ -25,8 +25,7 @@ EOT;
 
 $fpm = run_fpm($cfg, $tail);
 if (is_resource($fpm)) {
-    echo fgets($tail);
-    echo fgets($tail);
+    fpm_display_log($tail, 2);
     try {
 		run_request('127.0.0.1', $port);
 		echo "IPv4 ok\n";
diff --git a/sapi/fpm/tests/006.phpt b/sapi/fpm/tests/006.phpt
index d8b47ee533..a12ca253d2 100644
--- a/sapi/fpm/tests/006.phpt
+++ b/sapi/fpm/tests/006.phpt
@@ -25,8 +25,7 @@ EOT;
 
 $fpm = run_fpm($cfg, $tail);
 if (is_resource($fpm)) {
-    echo fgets($tail);
-    echo fgets($tail);
+    fpm_display_log($tail, 2);
     try {
 		run_request('127.0.0.1', $port);
 		echo "IPv4 ok\n";
diff --git a/sapi/fpm/tests/007.phpt b/sapi/fpm/tests/007.phpt
index 18893819e2..0d817907cf 100644
--- a/sapi/fpm/tests/007.phpt
+++ b/sapi/fpm/tests/007.phpt
@@ -28,8 +28,7 @@ EOT;
 
 $fpm = run_fpm($cfg, $tail);
 if (is_resource($fpm)) {
-    echo fgets($tail);
-    echo fgets($tail);
+    fpm_display_log($tail, 2);
     try {
 		var_dump(strpos(run_request('127.0.0.1', $port), 'pong'));
 		echo "IPv4 ok\n";
diff --git a/sapi/fpm/tests/008.phpt b/sapi/fpm/tests/008.phpt
index aaa773093c..60f1ea6ebd 100644
--- a/sapi/fpm/tests/008.phpt
+++ b/sapi/fpm/tests/008.phpt
@@ -41,8 +41,7 @@ EOT;
 
 $fpm = run_fpm($cfg, $tail);
 if (is_resource($fpm)) {
-    echo fgets($tail);
-    echo fgets($tail);
+    fpm_display_log($tail, 2);
     try {
 		var_dump(strpos(run_request('127.0.0.1', $port1), 'pong-dynamic'));
 		echo "Dynamic ok\n";
diff --git a/sapi/fpm/tests/009.phpt b/sapi/fpm/tests/009.phpt
index 836fb19323..34cdffcf83 100644
--- a/sapi/fpm/tests/009.phpt
+++ b/sapi/fpm/tests/009.phpt
@@ -26,8 +26,7 @@ EOT;
 
 $fpm = run_fpm($cfg, $tail);
 if (is_resource($fpm)) {
-    echo fgets($tail);
-    echo fgets($tail);
+    fpm_display_log($tail, 2);
     try {
 		var_dump(strpos(run_request('unix://'.$socket, -1), 'pong'));
 		echo "UDS ok\n";
diff --git a/sapi/fpm/tests/010.phpt b/sapi/fpm/tests/010.phpt
index dc8d5bb949..37c778db5b 100644
--- a/sapi/fpm/tests/010.phpt
+++ b/sapi/fpm/tests/010.phpt
@@ -25,8 +25,7 @@ EOT;
 
 $fpm = run_fpm($cfg, $tail);
 if (is_resource($fpm)) {
-    echo fgets($tail);
-    echo fgets($tail);
+    fpm_display_log($tail, 2);
     try {
 		echo run_request('127.0.0.1', $port, '/status');
 
diff --git a/sapi/fpm/tests/011.phpt b/sapi/fpm/tests/011.phpt
index ddcf67f6d3..0b849f873b 100644
--- a/sapi/fpm/tests/011.phpt
+++ b/sapi/fpm/tests/011.phpt
@@ -26,8 +26,7 @@ EOT;
 
 $fpm = run_fpm($cfg, $tail);
 if (is_resource($fpm)) {
-    echo fgets($tail);
-    echo fgets($tail);
+    fpm_display_log($tail, 2);
     try {
 		var_dump(strpos(run_request('127.0.0.1', $port), 'pong'));
 		echo "IPv4 ok\n";