From e613889d507a3245f5ddb2c6afdb698f616ebf5d Mon Sep 17 00:00:00 2001
From: Olivier DOUCET <odoucet@php.net>
Date: Sat, 25 Feb 2012 12:10:41 +0000
Subject: [PATCH] more verbose skip reason in test files with not so obvious
 extension requirements

---
 Zend/tests/bug34199.phpt                           | 2 +-
 Zend/tests/bug39602.phpt                           | 2 +-
 Zend/tests/bug42819.phpt                           | 2 +-
 Zend/tests/bug43918.phpt                           | 2 +-
 Zend/tests/bug50174.phpt                           | 2 +-
 Zend/tests/gc_024.phpt                             | 2 +-
 Zend/tests/unset_cv10.phpt                         | 2 +-
 ext/soap/tests/bugs/bug34657.phpt                  | 2 +-
 ext/spl/tests/iterator_006.phpt                    | 2 +-
 ext/standard/tests/streams/stream_get_line_nb.phpt | 2 +-
 ext/xmlreader/tests/expand.phpt                    | 2 +-
 sapi/cli/tests/004.phpt                            | 2 +-
 sapi/cli/tests/005.phpt                            | 2 +-
 sapi/cli/tests/006.phpt                            | 2 +-
 tests/output/bug60282.phpt                         | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Zend/tests/bug34199.phpt b/Zend/tests/bug34199.phpt
index daae0deb3d5..3012d808fa9 100755
--- a/Zend/tests/bug34199.phpt
+++ b/Zend/tests/bug34199.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #34199 (if($obj)/if(!$obj) inconsistency because of cast handler)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if (!extension_loaded("simplexml")) print "skip SimpleXML extension required"; ?>
 --FILE--
 <?php
 $xml = "<root></root>";
diff --git a/Zend/tests/bug39602.phpt b/Zend/tests/bug39602.phpt
index daa10e4fdb4..db8763d8ae7 100755
--- a/Zend/tests/bug39602.phpt
+++ b/Zend/tests/bug39602.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #39602 (Invalid session.save_handler crashes PHP)
 --SKIPIF--
-<?php if (!extension_loaded("session")) die("skip"); ?>
+<?php if (!extension_loaded("session")) die("skip session extension required"); ?>
 --INI--
 session.save_handler=qwerty
 error_reporting=0
diff --git a/Zend/tests/bug42819.phpt b/Zend/tests/bug42819.phpt
index f4387eb93b5..e5266036990 100755
--- a/Zend/tests/bug42819.phpt
+++ b/Zend/tests/bug42819.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #42819 (namespaces in indexes of constant arrays)
 --SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
+<?php if (!extension_loaded("spl")) print "skip SPL extension required"; ?>
 --FILE--
 <?php
 namespace foo\foo;
diff --git a/Zend/tests/bug43918.phpt b/Zend/tests/bug43918.phpt
index c76ce83de84..e3389818bef 100644
--- a/Zend/tests/bug43918.phpt
+++ b/Zend/tests/bug43918.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #43918 (Segmentation fault in garbage collector)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if (!extension_loaded("simplexml")) print "skip SimpleXML extension required"; ?>
 --FILE--
 <?php
 $xmlstr = <<<XML
diff --git a/Zend/tests/bug50174.phpt b/Zend/tests/bug50174.phpt
index fef65136ba8..ac2ad2cb8d7 100644
--- a/Zend/tests/bug50174.phpt
+++ b/Zend/tests/bug50174.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #50174 (Incorrectly matched docComment)
 --SKIPIF--
-<?php if (!extension_loaded('reflection') || !extension_loaded('spl')) print "skip"; ?>
+<?php if (!extension_loaded('reflection') || !extension_loaded('spl')) print "skip SPL and reflection extensions required"; ?>
 --FILE--
 <?php
 
diff --git a/Zend/tests/gc_024.phpt b/Zend/tests/gc_024.phpt
index a139e95da47..9a2ceb88f50 100644
--- a/Zend/tests/gc_024.phpt
+++ b/Zend/tests/gc_024.phpt
@@ -3,7 +3,7 @@ GC 024: GC and objects with non-standard handlers
 --INI--
 zend.enable_gc=1
 --SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
+<?php if (!extension_loaded("spl")) print "skip SPL extension required"; ?>
 --FILE--
 <?php
 $a = new ArrayObject();
diff --git a/Zend/tests/unset_cv10.phpt b/Zend/tests/unset_cv10.phpt
index 0eb41922c50..3b943d8b6ab 100644
--- a/Zend/tests/unset_cv10.phpt
+++ b/Zend/tests/unset_cv10.phpt
@@ -1,7 +1,7 @@
 --TEST--
 unset() CV 10 (unset() of global variable in ArrayObject::offsetUnset($GLOBALS))
 --SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
+<?php if (!extension_loaded("spl")) print "skip SPL extension required"; ?>
 --FILE--
 <?php
 $a = new ArrayObject($GLOBALS);
diff --git a/ext/soap/tests/bugs/bug34657.phpt b/ext/soap/tests/bugs/bug34657.phpt
index 0069c939562..d974d02cc6a 100755
--- a/ext/soap/tests/bugs/bug34657.phpt
+++ b/ext/soap/tests/bugs/bug34657.phpt
@@ -8,7 +8,7 @@ if (extension_loaded("openssl")) {
 	 when openssl loaded, tcp stream is less verbose, so some error messages are missing 
 	 so let's skip the test in this case  
 	 */
-	die("skip");
+	die("skip OpenSSL extension required");
 }
 ?>
 --FILE--
diff --git a/ext/spl/tests/iterator_006.phpt b/ext/spl/tests/iterator_006.phpt
index 1a1be0561ad..54da89cbd73 100755
--- a/ext/spl/tests/iterator_006.phpt
+++ b/ext/spl/tests/iterator_006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SPL: IteratorIterator and SimpleXMlElement
 --SKIPIF--
-<?php if (!extension_loaded('simplexml')) print "skip"; ?>
+<?php if (!extension_loaded('simplexml')) print "skip SimpleXML required"; ?>
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/streams/stream_get_line_nb.phpt b/ext/standard/tests/streams/stream_get_line_nb.phpt
index 3e3848f54a0..ce981203ffb 100644
--- a/ext/standard/tests/streams/stream_get_line_nb.phpt
+++ b/ext/standard/tests/streams/stream_get_line_nb.phpt
@@ -3,7 +3,7 @@ stream_get_line() on non-blocking stream
 --SKIPIF--
 <?php
 $sockets = @stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0);
-if (!$sockets) die("skip");
+if (!$sockets) die("skip stream_socket_pair() should work");
 fclose($sockets[0]);
 fclose($sockets[1]);
 ?>
diff --git a/ext/xmlreader/tests/expand.phpt b/ext/xmlreader/tests/expand.phpt
index 99c0604b8e6..c77e6c31b79 100644
--- a/ext/xmlreader/tests/expand.phpt
+++ b/ext/xmlreader/tests/expand.phpt
@@ -2,7 +2,7 @@
 XMLReader: Expand into existing DOM documet
 --SKIPIF--
 <?php if (!extension_loaded("xmlreader")) print "skip";
-if (!extension_loaded("dom")) print "skip";
+if (!extension_loaded("dom")) print "skip DOM extension required";
 $reader = new XMLReader();
 if (!method_exists($reader, 'expand')) print "skip";
 ?>
diff --git a/sapi/cli/tests/004.phpt b/sapi/cli/tests/004.phpt
index a1a01355d2e..378515d4644 100644
--- a/sapi/cli/tests/004.phpt
+++ b/sapi/cli/tests/004.phpt
@@ -4,7 +4,7 @@ show information about function
 <?php 
 include "skipif.inc"; 
 if (!extension_loaded("reflection")) {
-	die("skip");
+	die("skip reflection extension required");
 }
 ?>
 --FILE--
diff --git a/sapi/cli/tests/005.phpt b/sapi/cli/tests/005.phpt
index 914e33c7feb..84b0f98440a 100644
--- a/sapi/cli/tests/005.phpt
+++ b/sapi/cli/tests/005.phpt
@@ -4,7 +4,7 @@ show information about class
 <?php 
 include "skipif.inc"; 
 if (!extension_loaded("reflection")) {
-	die("skip");
+	die("skip reflection extension required");
 }
 ?>
 --FILE--
diff --git a/sapi/cli/tests/006.phpt b/sapi/cli/tests/006.phpt
index 530bfbd9ffc..3f3f3c13a12 100644
--- a/sapi/cli/tests/006.phpt
+++ b/sapi/cli/tests/006.phpt
@@ -4,7 +4,7 @@ show information about extension
 <?php 
 include "skipif.inc"; 
 if (!extension_loaded("reflection") || !extension_loaded("session")) {
-	die("skip");
+	die("skip reflection and session extensions required");
 }
 ?>
 --INI--
diff --git a/tests/output/bug60282.phpt b/tests/output/bug60282.phpt
index 66ee3969e53..08bcc0f2017 100644
--- a/tests/output/bug60282.phpt
+++ b/tests/output/bug60282.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #60282 (Segfault when using ob_gzhandler() with open buffers)
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) print "skip Zlib extension required"; ?>
 --FILE--
 <?php
 ob_start();