Skip to content

Commit c93aba0

Browse files
committed
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
1 parent 8ca1f47 commit c93aba0

17 files changed

+28
-25
lines changed

ext/fileinfo/tests/finfo_file_stream_001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
finfo_file(): Files and directories inside an stream
33
--SKIPIF--
44
<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
5-
<?php if (!extension_loaded('zip')) { die("skip"); } ?>
5+
<?php if (!extension_loaded('zip')) { die("skip zip extension not loaded"); } ?>
66
--FILE--
77
<?php
88

ext/fileinfo/tests/skipif.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
if (!extension_loaded('fileinfo')) {
4-
die("skip");
4+
die("skip fileinfo extension not loaded");
55
}
66

77
?>

ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
Test iconv_mime_encode() function : usage variations - Pass different data types to mode arg
33
--SKIPIF--
44
<?php
5-
PHP_INT_SIZE == 4 or die('skip');
6-
extension_loaded('iconv') or die('skip');
5+
PHP_INT_SIZE == 4 or die('skip 32-bit only');
6+
extension_loaded('iconv') or die('skip iconv extension not loaded');
77
function_exists('iconv_mime_decode_headers') or die("skip iconv_mime_decode_headers() is not available in this build");
88
?>
99
--FILE--

ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
Test iconv_mime_encode() function : usage variations - Pass different data types to charset arg
33
--SKIPIF--
44
<?php
5-
PHP_INT_SIZE == 4 or die('skip');
6-
extension_loaded('iconv') or die('skip');
5+
PHP_INT_SIZE == 4 or die('skip 32-bit only');
6+
extension_loaded('iconv') or die('skip iconv extension not loaded');
77
function_exists('iconv_mime_decode_headers') or die("skip iconv_mime_decode_headers() is not available in this build");
88
?>
99
--FILE--

ext/iconv/tests/iconv_mime_decode_variation2.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
Test iconv_mime_decode() function : usage variations - Pass different data types to mode arg
33
--SKIPIF--
44
<?php
5-
PHP_INT_SIZE == 4 or die('skip');
6-
extension_loaded('iconv') or die('skip');
5+
PHP_INT_SIZE == 4 or die('skip 32-bit only');
6+
extension_loaded('iconv') or die('skip iconv extension not loaded');
77
function_exists('iconv_mime_decode') or die("skip iconv_mime_decode() is not available in this build");
88
?>
99
--FILE--

ext/intl/tests/collator_get_locale2.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
--TEST--
22
get_locale() icu >= 4.8
33
--SKIPIF--
4-
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
5-
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip'; ?>
4+
<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
5+
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip ICU 4.8+ only'; ?>
66
<?php if (PHP_INT_SIZE != 8) die('skip 64-bit only'); ?>
77
--FILE--
88
<?php

ext/intl/tests/dateformat_clone2.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
--TEST--
22
Cloning datefmt icu >= 4.8
33
--SKIPIF--
4-
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
5-
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip'; ?>
4+
<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
5+
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip ICU 4.8+ only'; ?>
66
--FILE--
77
<?php
88
include_once( 'ut_common.inc' );

ext/intl/tests/dateformat_get_set_pattern2.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
--TEST--
22
datefmt_get_pattern_code and datefmt_set_pattern_code() icu >= 4.8
33
--SKIPIF--
4-
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
5-
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip'; ?>
4+
<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
5+
<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip ICU 4.8+ only'; ?>
66
--FILE--
77

88
<?php

ext/odbc/tests/skipif.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
if (!extension_loaded('odbc')) die('skip');
3+
if (!extension_loaded('odbc')) die('skip odbc extension not loaded');
44

55
include 'config.inc';
66

ext/pdo_firebird/tests/skipif.inc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?php /* $Id$ */
22

3-
if (!extension_loaded("interbase") || !extension_loaded("pdo_firebird")) print "skip";
3+
if (!extension_loaded("pdo_firebird")) die('skip pdo_firebird extension not loaded');
4+
if (!extension_loaded("interbase")) print "skip interbase extension not loaded";
45

56
?>

0 commit comments

Comments
 (0)