From c93aba042f8923de9d0078a769f14d8c13016476 Mon Sep 17 00:00:00 2001
From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Sun, 22 Jul 2018 16:41:41 -0300
Subject: [PATCH] Give a reason why the test was skipped

This will help us debug why a test was skipped in GCOV
(http://gcov.php.net/viewer.php?version=PHP_HEAD&func=skip), and maybe
put them to run again
---
 ext/fileinfo/tests/finfo_file_stream_001.phpt             | 2 +-
 ext/fileinfo/tests/skipif.inc                             | 2 +-
 ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt | 4 ++--
 ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt | 4 ++--
 ext/iconv/tests/iconv_mime_decode_variation2.phpt         | 4 ++--
 ext/intl/tests/collator_get_locale2.phpt                  | 4 ++--
 ext/intl/tests/dateformat_clone2.phpt                     | 4 ++--
 ext/intl/tests/dateformat_get_set_pattern2.phpt           | 4 ++--
 ext/odbc/tests/skipif.inc                                 | 2 +-
 ext/pdo_firebird/tests/skipif.inc                         | 3 ++-
 ext/pdo_sqlite/tests/bug_63916-2.phpt                     | 4 ++--
 ext/readline/tests/readline_read_history_error_001.phpt   | 4 +++-
 ext/spl/tests/dit_001_noglob.phpt                         | 2 +-
 ext/sqlite3/tests/bug63921-32bit.phpt                     | 4 ++--
 ext/sqlite3/tests/skipif.inc                              | 2 +-
 ext/sqlite3/tests/sqlite3_11_numrows.phpt                 | 2 +-
 ext/standard/tests/strings/bug65230.phpt                  | 2 +-
 17 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/ext/fileinfo/tests/finfo_file_stream_001.phpt b/ext/fileinfo/tests/finfo_file_stream_001.phpt
index 4a22c5419d..3d371b71bd 100644
--- a/ext/fileinfo/tests/finfo_file_stream_001.phpt
+++ b/ext/fileinfo/tests/finfo_file_stream_001.phpt
@@ -2,7 +2,7 @@
 finfo_file(): Files and directories inside an stream
 --SKIPIF--
 <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
-<?php if (!extension_loaded('zip')) { die("skip"); } ?>
+<?php if (!extension_loaded('zip')) { die("skip zip extension not loaded"); } ?>
 --FILE--
 <?php
 
diff --git a/ext/fileinfo/tests/skipif.inc b/ext/fileinfo/tests/skipif.inc
index 405800971e..97b2546809 100644
--- a/ext/fileinfo/tests/skipif.inc
+++ b/ext/fileinfo/tests/skipif.inc
@@ -1,7 +1,7 @@
 <?php
 
 if (!extension_loaded('fileinfo')) {
-	die("skip");
+	die("skip fileinfo extension not loaded");
 }
 
 ?>
diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
index 4e547c131f..a0e40aaa0c 100644
--- a/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
@@ -2,8 +2,8 @@
 Test iconv_mime_encode() function : usage variations - Pass different data types to mode arg
 --SKIPIF--
 <?php
-PHP_INT_SIZE == 4 or die('skip');
-extension_loaded('iconv') or die('skip');
+PHP_INT_SIZE == 4 or die('skip 32-bit only');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_mime_decode_headers') or die("skip iconv_mime_decode_headers() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
index e17525e0fe..da481e7514 100644
--- a/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
@@ -2,8 +2,8 @@
 Test iconv_mime_encode() function : usage variations - Pass different data types to charset arg
 --SKIPIF--
 <?php
-PHP_INT_SIZE == 4 or die('skip');
-extension_loaded('iconv') or die('skip');
+PHP_INT_SIZE == 4 or die('skip 32-bit only');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_mime_decode_headers') or die("skip iconv_mime_decode_headers() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_mime_decode_variation2.phpt b/ext/iconv/tests/iconv_mime_decode_variation2.phpt
index c4e3c4d400..b0426558ed 100644
--- a/ext/iconv/tests/iconv_mime_decode_variation2.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_variation2.phpt
@@ -2,8 +2,8 @@
 Test iconv_mime_decode() function : usage variations - Pass different data types to mode arg
 --SKIPIF--
 <?php
-PHP_INT_SIZE == 4 or die('skip');
-extension_loaded('iconv') or die('skip');
+PHP_INT_SIZE == 4 or die('skip 32-bit only');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_mime_decode') or die("skip iconv_mime_decode() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/intl/tests/collator_get_locale2.phpt b/ext/intl/tests/collator_get_locale2.phpt
index e9a9f2653d..944f42ec3e 100644
--- a/ext/intl/tests/collator_get_locale2.phpt
+++ b/ext/intl/tests/collator_get_locale2.phpt
@@ -1,8 +1,8 @@
 --TEST--
 get_locale() icu >= 4.8
 --SKIPIF--
-<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
-<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip'; ?>
+<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip ICU 4.8+ only'; ?>
 <?php if (PHP_INT_SIZE != 8) die('skip 64-bit only'); ?>
 --FILE--
 <?php
diff --git a/ext/intl/tests/dateformat_clone2.phpt b/ext/intl/tests/dateformat_clone2.phpt
index 34b802120a..052b732164 100644
--- a/ext/intl/tests/dateformat_clone2.phpt
+++ b/ext/intl/tests/dateformat_clone2.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Cloning datefmt icu >= 4.8
 --SKIPIF--
-<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
-<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip'; ?>
+<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip ICU 4.8+ only'; ?>
 --FILE--
 <?php
 include_once( 'ut_common.inc' );
diff --git a/ext/intl/tests/dateformat_get_set_pattern2.phpt b/ext/intl/tests/dateformat_get_set_pattern2.phpt
index de41f1067c..b64ec179ad 100644
--- a/ext/intl/tests/dateformat_get_set_pattern2.phpt
+++ b/ext/intl/tests/dateformat_get_set_pattern2.phpt
@@ -1,8 +1,8 @@
 --TEST--
 datefmt_get_pattern_code and datefmt_set_pattern_code() icu >= 4.8
 --SKIPIF--
-<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
-<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip'; ?>
+<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip ICU 4.8+ only'; ?>
 --FILE--
 
 <?php
diff --git a/ext/odbc/tests/skipif.inc b/ext/odbc/tests/skipif.inc
index 179a5b180e..4cd13d0be6 100644
--- a/ext/odbc/tests/skipif.inc
+++ b/ext/odbc/tests/skipif.inc
@@ -1,6 +1,6 @@
 <?php
 
-if (!extension_loaded('odbc')) die('skip');
+if (!extension_loaded('odbc')) die('skip odbc extension not loaded');
 
 include 'config.inc';
 
diff --git a/ext/pdo_firebird/tests/skipif.inc b/ext/pdo_firebird/tests/skipif.inc
index 14b2ad4016..f87f939e14 100644
--- a/ext/pdo_firebird/tests/skipif.inc
+++ b/ext/pdo_firebird/tests/skipif.inc
@@ -1,5 +1,6 @@
 <?php /* $Id$ */
 
-if (!extension_loaded("interbase") || !extension_loaded("pdo_firebird")) print "skip";
+if (!extension_loaded("pdo_firebird")) die('skip pdo_firebird extension not loaded');
+if (!extension_loaded("interbase")) print "skip interbase extension not loaded";
 
 ?>
diff --git a/ext/pdo_sqlite/tests/bug_63916-2.phpt b/ext/pdo_sqlite/tests/bug_63916-2.phpt
index bc9bfc9c98..4535410b55 100644
--- a/ext/pdo_sqlite/tests/bug_63916-2.phpt
+++ b/ext/pdo_sqlite/tests/bug_63916-2.phpt
@@ -2,8 +2,8 @@
 Bug #63916 PDO::PARAM_INT casts to 32bit int internally even on 64bit builds in pdo_sqlite
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo_sqlite')) die('skip');
-if (PHP_INT_SIZE > 4) die('skip');
+if (!extension_loaded('pdo_sqlite')) die('skip pdo_sqlite extension not loaded');
+if (PHP_INT_SIZE > 4) die('skip 32-bit only');
 ?>
 --FILE--
 <?php
diff --git a/ext/readline/tests/readline_read_history_error_001.phpt b/ext/readline/tests/readline_read_history_error_001.phpt
index 1b39cbfb12..836c83b807 100644
--- a/ext/readline/tests/readline_read_history_error_001.phpt
+++ b/ext/readline/tests/readline_read_history_error_001.phpt
@@ -3,7 +3,9 @@ readline_read_history() function - Error cases
 --CREDITS--
 Pedro Manoel Evangelista <pedro.evangelista at gmail dot com>
 --SKIPIF--
-<?php if (!extension_loaded("readline") || !function_exists('readline_read_history') || READLINE_LIB != "libedit") die("skip"); ?>
+<?php if (!extension_loaded("readline")) die('skip readline extension not loaded'); ?>
+<?php if (!function_exists('readline_read_history')) die('skip readline_read_history function does not exist'); ?>
+<?php if (!READLINE_LIB != "libedit") die('skip READLINE_LIB != "libedit"'); ?>
 --FILE--
 <?php
 var_dump(readline_read_history());
diff --git a/ext/spl/tests/dit_001_noglob.phpt b/ext/spl/tests/dit_001_noglob.phpt
index acb2092a55..f1104c881b 100644
--- a/ext/spl/tests/dit_001_noglob.phpt
+++ b/ext/spl/tests/dit_001_noglob.phpt
@@ -2,7 +2,7 @@
 SPL: Problem with casting to string (no glob version)
 --SKIPIF--
 <?php
-if (defined('GLOB_ERR')) print "skip";
+if (defined('GLOB_ERR')) print "skip GLOB_ERR defined";
 --FILE--
 <?php
 $d = new DirectoryIterator('.');
diff --git a/ext/sqlite3/tests/bug63921-32bit.phpt b/ext/sqlite3/tests/bug63921-32bit.phpt
index d2cc7b2002..1eaa3496ed 100644
--- a/ext/sqlite3/tests/bug63921-32bit.phpt
+++ b/ext/sqlite3/tests/bug63921-32bit.phpt
@@ -2,8 +2,8 @@
 Bug #63921 sqlite3::bindvalue and relative PHP functions aren't using sqlite3_*_int64 API
 --SKIPIF--
 <?php
-if (!extension_loaded('sqlite3')) die('skip');
-if (PHP_INT_SIZE > 4) die('skip'); // skip for 64bit builds - there is another test for that
+if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not loaded');
+if (PHP_INT_SIZE > 4) die('skip 32-bit only'); // skip for 64bit builds - there is another test for that
 ?>
 --FILE--
 <?php
diff --git a/ext/sqlite3/tests/skipif.inc b/ext/sqlite3/tests/skipif.inc
index 3427965d1d..9614e679b9 100644
--- a/ext/sqlite3/tests/skipif.inc
+++ b/ext/sqlite3/tests/skipif.inc
@@ -1,7 +1,7 @@
 <?php
 
 if (!extension_loaded('sqlite3')) {
-	die("skip");
+	die("skip sqlite3 extension not loaded");
 }
 
 ?>
diff --git a/ext/sqlite3/tests/sqlite3_11_numrows.phpt b/ext/sqlite3/tests/sqlite3_11_numrows.phpt
index 87168db06b..49b8cd7cc7 100644
--- a/ext/sqlite3/tests/sqlite3_11_numrows.phpt
+++ b/ext/sqlite3/tests/sqlite3_11_numrows.phpt
@@ -6,7 +6,7 @@ SQLite3::prepare number of rows
 try {
 	$method = new ReflectionMethod('sqlite3result', 'numRows');
 } catch (ReflectionException $e) {
-	die("skip");
+	die("skip SQLite3Result::numRows method does not exist");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/strings/bug65230.phpt b/ext/standard/tests/strings/bug65230.phpt
index c707dd3691..c92e558c49 100644
--- a/ext/standard/tests/strings/bug65230.phpt
+++ b/ext/standard/tests/strings/bug65230.phpt
@@ -3,7 +3,7 @@ Bug #65230 setting locale randomly broken
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) != 'WIN') {
-    die('skip');
+    die('skip Windows only test');
 }
 ?>
 --INI--
-- 
2.50.0