Give a reason why the test was skipped

A follow up for c93aba04

diff --git a/ext/intl/tests/dateformat_set_timezone_id2.phpt b/ext/intl/tests/dateformat_set_timezone_id2.phpt
index a706ee763b9e0fd8a8672b1e23b2929b6bd60b48..cb3b7802051a6e4cf78f4ada843d0c90b3465575 100644 (file)
--- a/ext/intl/tests/dateformat_set_timezone_id2.phpt
+++ b/ext/intl/tests/dateformat_set_timezone_id2.phpt
@@ -3,8 +3,8 @@ datefmt_set_timezone_id_code() icu >= 4.8
 --INI--
 date.timezone=Atlantic/Azores
 --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 for ICU > 4.8'; ?>
 <?php if (version_compare(INTL_ICU_VERSION, '50.1.2') >=  0) die('skip for ICU < 50.1.2'); ?>
 --FILE--
 <?php

diff --git a/ext/intl/tests/formatter_format2.phpt b/ext/intl/tests/formatter_format2.phpt
index 32c42f69da6366b982798f91f2ad7ea3c1e34d60..9a3596c153b68650b33ce3713c9e0ac13c597d4d 100644 (file)
--- a/ext/intl/tests/formatter_format2.phpt
+++ b/ext/intl/tests/formatter_format2.phpt
@@ -1,8 +1,9 @@
 --TEST--
 numfmt_format() icu >= 4.8
 --SKIPIF--
-<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
-<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0 || version_compare(INTL_ICU_VERSION, '52.1') >= 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 for ICU > 4.8'; ?>
+<?php if (version_compare(INTL_ICU_VERSION, '52.1') >=  0) die('skip for ICU <= 52.1'); ?>
 --FILE--
 <?php
 

diff --git a/ext/intl/tests/formatter_format_currency2.phpt b/ext/intl/tests/formatter_format_currency2.phpt
index 16a421018cfa265c874efb1c58e070a34384ba18..088c8896d947e7ef851e54293ef6c4515a0feb02 100644 (file)
--- a/ext/intl/tests/formatter_format_currency2.phpt
+++ b/ext/intl/tests/formatter_format_currency2.phpt
@@ -1,8 +1,8 @@
 --TEST--
 numfmt_format_currency() 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 for ICU > 4.8'; ?>
 --FILE--
 <?php
 

diff --git a/ext/intl/tests/formatter_get_set_symbol2.phpt b/ext/intl/tests/formatter_get_set_symbol2.phpt
index 8e762f350f1d6cd8d4087374390307114bb70c8d..dc581f8882eb002a05f2eb5d91e1422b7e360754 100644 (file)
--- a/ext/intl/tests/formatter_get_set_symbol2.phpt
+++ b/ext/intl/tests/formatter_get_set_symbol2.phpt
@@ -1,8 +1,8 @@
 --TEST--
 numfmt_get/set_symbol() 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 for ICU > 4.8'; ?>
 <?php if (PHP_INT_SIZE != 8) die('skip 64-bit only'); ?>
 --FILE--
 <?php

diff --git a/ext/intl/tests/intl_icu_data_version_constant.phpt b/ext/intl/tests/intl_icu_data_version_constant.phpt
index ad0121858686b4270ce1cbd18737be83cda572ec..e06bc92e107626cd0ea8465986f5abf28b9080a6 100644 (file)
--- a/ext/intl/tests/intl_icu_data_version_constant.phpt
+++ b/ext/intl/tests/intl_icu_data_version_constant.phpt
@@ -1,7 +1,8 @@
 --TEST--
 INTL_ICU_DATA_VERSION constant
 --SKIPIF--
-<?php if( !extension_loaded( 'intl' ) || version_compare('INTL_ICU_VERSION', '4.4', '<') ) print 'skip'; ?>
+<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
+<?php if(version_compare('INTL_ICU_VERSION', '4.4', '<') < 0) print 'skip for ICU > 4.4'; ?>
 --FILE--
 <?php
 var_dump(defined("INTL_ICU_DATA_VERSION"));

diff --git a/ext/intl/tests/locale_filter_matches2.phpt b/ext/intl/tests/locale_filter_matches2.phpt
index 46771b7c1a1ddb01149cdefbbf77f97272e27c5a..97e9bdde2cf355b6b222f2e58156ad4cb9d7c7b2 100644 (file)
--- a/ext/intl/tests/locale_filter_matches2.phpt
+++ b/ext/intl/tests/locale_filter_matches2.phpt
@@ -1,8 +1,8 @@
 --TEST--
 locale_filter_matches.phpt() icu >= 4.8 && icu < 50.1.2
 --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 for ICU > 4.8'; ?>
 <?php if (version_compare(INTL_ICU_VERSION, '50.1.2') >=  0) die('skip for ICU < 50.1.2'); ?>
 --FILE--
 <?php

diff --git a/ext/intl/tests/locale_get_display_name2.phpt b/ext/intl/tests/locale_get_display_name2.phpt
index dcc996eca97855311b3e34b1a6301e9828f430e4..9edc8e0aeb4a27d0cbcecd8f920f8c7b3f0b43b5 100644 (file)
--- a/ext/intl/tests/locale_get_display_name2.phpt
+++ b/ext/intl/tests/locale_get_display_name2.phpt
@@ -1,8 +1,8 @@
 --TEST--
 locale_get_display_name() icu >= 4.8 && icu < 50.1.2
 --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 for ICU > 4.8'; ?>
 <?php if (version_compare(INTL_ICU_VERSION, '50.1.2') >=  0) die('skip for ICU < 50.1.2'); ?>
 --FILE--
 <?php

diff --git a/ext/intl/tests/locale_get_display_region2.phpt b/ext/intl/tests/locale_get_display_region2.phpt
index 82334db4618eac12bd2c8f693ebd813955727d36..835261da027b855acee30aed72b44e05bbddc192 100644 (file)
--- a/ext/intl/tests/locale_get_display_region2.phpt
+++ b/ext/intl/tests/locale_get_display_region2.phpt
@@ -1,9 +1,9 @@
 --TEST--
 locale_get_display_region() icu >= 4.8 && icu < 51.2
 --SKIPIF--
-<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
-<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip'; ?>
-<?php if (version_compare(INTL_ICU_VERSION, '50.1.2') >=  0) die('skip for ICU < 50.1.2'); ?>
+<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip for ICU > 4.8'; ?>
+<?php if (version_compare(INTL_ICU_VERSION, '50.1.2') >=  0) die('skip for ICU <= 50.1.2'); ?>
 --FILE--
 <?php
 

diff --git a/ext/intl/tests/locale_get_display_script2.phpt b/ext/intl/tests/locale_get_display_script2.phpt
index 2b9e037b788c46168faddc6acb3840604d17c210..d59425e5f03376a63ca12c365d97b8c3ed80e021 100644 (file)
--- a/ext/intl/tests/locale_get_display_script2.phpt
+++ b/ext/intl/tests/locale_get_display_script2.phpt
@@ -1,8 +1,9 @@
 --TEST--
 locale_get_display_script()  icu = 4.8
 --SKIPIF--
-<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
-<?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0 || version_compare(INTL_ICU_VERSION, '49') >= 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 for ICU > 4.8'; ?>
+<?php if (version_compare(INTL_ICU_VERSION, '49') >=  0) die('skip for ICU <= 49'); ?>
 --FILE--
 <?php
 

diff --git a/ext/intl/tests/locale_get_display_script3.phpt b/ext/intl/tests/locale_get_display_script3.phpt
index 972f060cdbc0bb7bb79f0801c769fcda2e1693ac..b0a54230b7cbc491e7eb67a46a18c94235a0afb1 100644 (file)
--- a/ext/intl/tests/locale_get_display_script3.phpt
+++ b/ext/intl/tests/locale_get_display_script3.phpt
@@ -1,8 +1,9 @@
 --TEST--
 locale_get_display_script()  icu >= 49
 --SKIPIF--
-<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
-<?php if(version_compare(INTL_ICU_VERSION, '49') < 0 || version_compare(INTL_ICU_VERSION, '52.1') >= 0) print 'skip'; ?>
+<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '49') < 0) print 'skip for ICU > 49'; ?>
+<?php if (version_compare(INTL_ICU_VERSION, '52.1') >=  0) die('skip for ICU <= 52.1'); ?>
 --FILE--
 <?php
 

diff --git a/ext/intl/tests/locale_get_display_script4.phpt b/ext/intl/tests/locale_get_display_script4.phpt
index dd50dcfc0a1a786f6045fcf408384d14cc88f304..470ece2e79bcaa34e01f6ee1e4120381938ca5fb 100644 (file)
--- a/ext/intl/tests/locale_get_display_script4.phpt
+++ b/ext/intl/tests/locale_get_display_script4.phpt
@@ -1,8 +1,8 @@
 --TEST--
 locale_get_display_script()  icu >= 52.1
 --SKIPIF--
-<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
-<?php if(version_compare(INTL_ICU_VERSION, '52.1') < 0) print 'skip'; ?>
+<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
+<?php if(version_compare(INTL_ICU_VERSION, '52.1') < 0) print 'skip for ICU > 52.1'; ?>
 --FILE--
 <?php
 

diff --git a/ext/intl/tests/locale_get_display_variant2.phpt b/ext/intl/tests/locale_get_display_variant2.phpt
index 2517240e3007aa4af4276ff9282a9a52e894cc84..c432eb7b050f556a38f32f8325bff5fb74103241 100644 (file)
--- a/ext/intl/tests/locale_get_display_variant2.phpt
+++ b/ext/intl/tests/locale_get_display_variant2.phpt
@@ -1,8 +1,8 @@
 --TEST--
 locale_get_display_variant() 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 for ICU > 4.8'; ?>
 --FILE--
 <?php
 

diff --git a/ext/intl/tests/locale_parse_locale2.phpt b/ext/intl/tests/locale_parse_locale2.phpt
index f1482730c37a7e4d538c913da0103dc326ed6978..5f885ccfe38b9135cf7b3f03352554b67d475de5 100644 (file)
--- a/ext/intl/tests/locale_parse_locale2.phpt
+++ b/ext/intl/tests/locale_parse_locale2.phpt
@@ -1,8 +1,8 @@
 --TEST--
 locale_parse_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 for ICU > 4.8'; ?>
 --FILE--
 <?php
 

diff --git a/ext/intl/tests/msgfmt_fail2.phpt b/ext/intl/tests/msgfmt_fail2.phpt
index 698d19afcefea011dfeec22b1929fe4053edbd93..1b7e4e14493257f81b70604f232f9a2a28208908 100644 (file)
--- a/ext/intl/tests/msgfmt_fail2.phpt
+++ b/ext/intl/tests/msgfmt_fail2.phpt
@@ -1,8 +1,8 @@
 --TEST--
 msgfmt creation failures 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 for ICU > 4.8'; ?>
 --FILE--
 <?php
 

diff --git a/ext/intl/tests/normalizer_get_raw_decomposition.phpt b/ext/intl/tests/normalizer_get_raw_decomposition.phpt
index 8f13612bd8cf636f0dac74464bfca3e3e2c74977..7a374a9e61471125d08ae5bdc7e4419241ca170b 100644 (file)
--- a/ext/intl/tests/normalizer_get_raw_decomposition.phpt
+++ b/ext/intl/tests/normalizer_get_raw_decomposition.phpt
@@ -1,8 +1,8 @@
 --TEST--
 normalizer_get_raw_decomposition()
 --SKIPIF--
-<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
-<?php if( !function_exists( 'normalizer_get_raw_decomposition' ) ) print 'skip'; ?>
+<?php if( !extension_loaded( 'intl' ) ) print 'skip intl extension not loaded'; ?>
+<?php if( !function_exists( 'normalizer_get_raw_decomposition' ) ) print 'skip normalizer_get_raw_decomposition function does not exist'; ?>
 --FILE--
 <?php
 

diff --git a/ext/intl/tests/normalizer_normalize_kc_cf.phpt b/ext/intl/tests/normalizer_normalize_kc_cf.phpt
index 040cd29e0b1c4213317c8b58b19d06f8271a689c..a4e478cc4ea146c8da70fb63e43d42e3b12be88d 100644 (file)
--- a/ext/intl/tests/normalizer_normalize_kc_cf.phpt
+++ b/ext/intl/tests/normalizer_normalize_kc_cf.phpt
@@ -1,8 +1,8 @@
 --TEST--
 normalize() NFKC_Casefold
 --SKIPIF--
-<?php if (!extension_loaded('intl')) print 'skip'; ?>
-<?php if (!defined('Normalizer::FORM_KC_CF')) print 'skip'; ?>
+<?php if (!extension_loaded('intl')) print 'skip intl extension not loaded'; ?>
+<?php if (!defined('Normalizer::FORM_KC_CF')) print 'skip Normalizer::FORM_KC_CF constant not defined'; ?>
 --FILE--
 <?php
 

diff --git a/ext/intl/tests/resourcebundle_internal.phpt b/ext/intl/tests/resourcebundle_internal.phpt
index 2063ae22773a410e90b71230565ddce92d11796d..1a62713a6019b84810a481242bdcde774ce32dc2 100644 (file)
--- a/ext/intl/tests/resourcebundle_internal.phpt
+++ b/ext/intl/tests/resourcebundle_internal.phpt
@@ -1,7 +1,9 @@
 --TEST--
 Test ResourceBundle::__construct() with internal ICU bundles
 --SKIPIF--
-<?php if( !extension_loaded( 'intl' ) || !defined('INTL_ICU_DATA_VERSION') || version_compare(INTL_ICU_DATA_VERSION, '4.4', '<') ) print 'skip'; ?>
+<?php if( !extension_loaded( 'intl' )) print 'skip intl extension not loaded'; ?>
+<?php if( !defined('INTL_ICU_DATA_VERSION')) print 'skip INTL_ICU_DATA_VERSION constant not defined'; ?>
+<?php if( version_compare(INTL_ICU_DATA_VERSION, '4.4', '<')) print 'skip for ICU > 4.4'; ?>
 --FILE--
 <?php
 $b = new ResourceBundle('de_DE', 'ICUDATA-region');