Commit: 80044a0879d65f524f40d0dc01121a4446e16856
Author: Reeze Xia <reeze....@gmail.com> Wed, 15 Aug 2012 01:03:56
+0800
Parents: 1190bc440be0ab8ef6703dc9cb1dc4d64bf538f0
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=80044a0879d65f524f40d0dc01121a4446e16856
Log:
Fix intl tests failed because of missing skipif section
Changed paths:
M ext/intl/tests/breakiter___construct.phpt
M ext/intl/tests/breakiter_clone_basic.phpt
M ext/intl/tests/breakiter_current_basic.phpt
M ext/intl/tests/breakiter_factories_basic.phpt
M ext/intl/tests/breakiter_factories_error.phpt
M ext/intl/tests/breakiter_first_basic.phpt
M ext/intl/tests/breakiter_first_last_previous_current_error.phpt
M ext/intl/tests/breakiter_following_basic.phpt
M ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt
M ext/intl/tests/breakiter_getLocale_basic.phpt
M ext/intl/tests/breakiter_getLocale_error.phpt
M ext/intl/tests/breakiter_getPartsIterator_basic.phpt
M ext/intl/tests/breakiter_getText_basic.phpt
M ext/intl/tests/breakiter_getText_error.phpt
M ext/intl/tests/breakiter_isBoundary_basic.phpt
M ext/intl/tests/breakiter_last_basic.phpt
M ext/intl/tests/breakiter_next_basic.phpt
M ext/intl/tests/breakiter_next_error.phpt
M ext/intl/tests/breakiter_preceding_basic.phpt
M ext/intl/tests/breakiter_previous_basic.phpt
M ext/intl/tests/breakiter_setText_basic.phpt
M ext/intl/tests/breakiter_setText_error.phpt
M ext/intl/tests/dateformat___construct_bad_tz_cal.phpt
M ext/intl/tests/dateformat_create_cal_arg.phpt
M ext/intl/tests/dateformat_getCalendarObject_error.phpt
M ext/intl/tests/dateformat_getTimeZone_error.phpt
M ext/intl/tests/dateformat_get_set_calendar.phpt
M ext/intl/tests/dateformat_get_set_timezone.phpt
M ext/intl/tests/dateformat_setTimeZoneID_deprecation.phpt
M ext/intl/tests/dateformat_setTimeZone_error.phpt
M ext/intl/tests/dateformat_timezone_arg_variations.phpt
M ext/intl/tests/rbbiter___construct_basic.phpt
M ext/intl/tests/rbbiter_getRuleStatusVec_basic.phpt
M ext/intl/tests/rbbiter_getRuleStatus_basic.phpt
M ext/intl/tests/rbbiter_getRules_basic.phpt
diff --git a/ext/intl/tests/breakiter___construct.phpt
b/ext/intl/tests/breakiter___construct.phpt
index 9ea6a9c..a818075 100644
--- a/ext/intl/tests/breakiter___construct.phpt
+++ b/ext/intl/tests/breakiter___construct.phpt
@@ -1,6 +1,7 @@
--TEST--
IntlBreakIterator::__construct() should not be callable
--SKIPIF--
+<?php
if (!extension_loaded('intl'))
die('skip intl extension not enabled');
--FILE--
diff --git a/ext/intl/tests/breakiter_clone_basic.phpt
b/ext/intl/tests/breakiter_clone_basic.phpt
index f5bcefc..d838f81 100644
--- a/ext/intl/tests/breakiter_clone_basic.phpt
+++ b/ext/intl/tests/breakiter_clone_basic.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlBreakIterator: clone handler
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_current_basic.phpt
b/ext/intl/tests/breakiter_current_basic.phpt
index 515cb55..2ce6da7 100644
--- a/ext/intl/tests/breakiter_current_basic.phpt
+++ b/ext/intl/tests/breakiter_current_basic.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlBreakIterator::current(): basic test
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_factories_basic.phpt
b/ext/intl/tests/breakiter_factories_basic.phpt
index 333023a..dcfcede 100644
--- a/ext/intl/tests/breakiter_factories_basic.phpt
+++ b/ext/intl/tests/breakiter_factories_basic.phpt
@@ -1,6 +1,7 @@
--TEST--
IntlBreakIterator factories: basic tests
--SKIPIF--
+<?php
if (!extension_loaded('intl'))
die('skip intl extension not enabled');
--FILE--
diff --git a/ext/intl/tests/breakiter_factories_error.phpt
b/ext/intl/tests/breakiter_factories_error.phpt
index 6001946..c35339f 100644
--- a/ext/intl/tests/breakiter_factories_error.phpt
+++ b/ext/intl/tests/breakiter_factories_error.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlBreakIterator factory methods: argument errors
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_first_basic.phpt
b/ext/intl/tests/breakiter_first_basic.phpt
index c8427ad..364d5f2 100644
--- a/ext/intl/tests/breakiter_first_basic.phpt
+++ b/ext/intl/tests/breakiter_first_basic.phpt
@@ -1,6 +1,7 @@
--TEST--
IntlBreakIterator::first(): basic test
--SKIPIF--
+<?php
if (!extension_loaded('intl'))
die('skip intl extension not enabled');
--FILE--
diff --git a/ext/intl/tests/breakiter_first_last_previous_current_error.phpt
b/ext/intl/tests/breakiter_first_last_previous_current_error.phpt
index 9865cde..2ab6812 100644
--- a/ext/intl/tests/breakiter_first_last_previous_current_error.phpt
+++ b/ext/intl/tests/breakiter_first_last_previous_current_error.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlBreakIterator::first()/last()/previous()/current(): arg errors
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_following_basic.phpt
b/ext/intl/tests/breakiter_following_basic.phpt
index 967ccaf..30798d9 100644
--- a/ext/intl/tests/breakiter_following_basic.phpt
+++ b/ext/intl/tests/breakiter_following_basic.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlBreakIterator::following(): basic test
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt
b/ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt
index a4b6085..5550ccf 100644
--- a/ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt
+++ b/ext/intl/tests/breakiter_following_preceding_isBoundary_error.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlBreakIterator::following()/preceding()/isBoundary(): arg errors
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_getLocale_basic.phpt
b/ext/intl/tests/breakiter_getLocale_basic.phpt
index 499316c..b0112cc 100644
--- a/ext/intl/tests/breakiter_getLocale_basic.phpt
+++ b/ext/intl/tests/breakiter_getLocale_basic.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlBreakIterator::getLocale(): basic test
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_getLocale_error.phpt
b/ext/intl/tests/breakiter_getLocale_error.phpt
index 1dec56d..9acd08a 100644
--- a/ext/intl/tests/breakiter_getLocale_error.phpt
+++ b/ext/intl/tests/breakiter_getLocale_error.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlBreakIterator::getLocale(): arg errors
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_getPartsIterator_basic.phpt
b/ext/intl/tests/breakiter_getPartsIterator_basic.phpt
index 794bab3..36ad80d 100644
--- a/ext/intl/tests/breakiter_getPartsIterator_basic.phpt
+++ b/ext/intl/tests/breakiter_getPartsIterator_basic.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlBreakIterator::getPartsIterator(): basic test
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_getText_basic.phpt
b/ext/intl/tests/breakiter_getText_basic.phpt
index 57f3e32..0e5a26c 100644
--- a/ext/intl/tests/breakiter_getText_basic.phpt
+++ b/ext/intl/tests/breakiter_getText_basic.phpt
@@ -1,6 +1,7 @@
--TEST--
IntlBreakIterator::getText(): basic test
--SKIPIF--
+<?php
if (!extension_loaded('intl'))
die('skip intl extension not enabled');
--FILE--
diff --git a/ext/intl/tests/breakiter_getText_error.phpt
b/ext/intl/tests/breakiter_getText_error.phpt
index f222002..91e9919 100644
--- a/ext/intl/tests/breakiter_getText_error.phpt
+++ b/ext/intl/tests/breakiter_getText_error.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlBreakIterator::getText(): arg errors
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_isBoundary_basic.phpt
b/ext/intl/tests/breakiter_isBoundary_basic.phpt
index 87d8227..1f41663 100644
--- a/ext/intl/tests/breakiter_isBoundary_basic.phpt
+++ b/ext/intl/tests/breakiter_isBoundary_basic.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlBreakIterator::isBoundary(): basic test
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_last_basic.phpt
b/ext/intl/tests/breakiter_last_basic.phpt
index 0d3aead..cf816c3 100644
--- a/ext/intl/tests/breakiter_last_basic.phpt
+++ b/ext/intl/tests/breakiter_last_basic.phpt
@@ -1,6 +1,7 @@
--TEST--
IntlBreakIterator::last(): basic test
--SKIPIF--
+<?php
if (!extension_loaded('intl'))
die('skip intl extension not enabled');
--FILE--
diff --git a/ext/intl/tests/breakiter_next_basic.phpt
b/ext/intl/tests/breakiter_next_basic.phpt
index 3d53544..4deb414 100644
--- a/ext/intl/tests/breakiter_next_basic.phpt
+++ b/ext/intl/tests/breakiter_next_basic.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlBreakIterator::next(): basic test
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_next_error.phpt
b/ext/intl/tests/breakiter_next_error.phpt
index 40d8f58..ed718bc 100644
--- a/ext/intl/tests/breakiter_next_error.phpt
+++ b/ext/intl/tests/breakiter_next_error.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlBreakIterator::next(): arg errors
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_preceding_basic.phpt
b/ext/intl/tests/breakiter_preceding_basic.phpt
index 6069520..6fa8dd7 100644
--- a/ext/intl/tests/breakiter_preceding_basic.phpt
+++ b/ext/intl/tests/breakiter_preceding_basic.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlBreakIterator::preceding(): basic test
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_previous_basic.phpt
b/ext/intl/tests/breakiter_previous_basic.phpt
index 6d4f3bc..c3343af 100644
--- a/ext/intl/tests/breakiter_previous_basic.phpt
+++ b/ext/intl/tests/breakiter_previous_basic.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlBreakIterator::previous(): basic test
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_setText_basic.phpt
b/ext/intl/tests/breakiter_setText_basic.phpt
index 7b3fa2a..a5e4f86 100644
--- a/ext/intl/tests/breakiter_setText_basic.phpt
+++ b/ext/intl/tests/breakiter_setText_basic.phpt
@@ -1,6 +1,7 @@
--TEST--
IntlBreakIterator::setText(): basic test
--SKIPIF--
+<?php
if (!extension_loaded('intl'))
die('skip intl extension not enabled');
--FILE--
diff --git a/ext/intl/tests/breakiter_setText_error.phpt
b/ext/intl/tests/breakiter_setText_error.phpt
index bfcda8d..a7a73a0 100644
--- a/ext/intl/tests/breakiter_setText_error.phpt
+++ b/ext/intl/tests/breakiter_setText_error.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlBreakIterator::setText(): arg errors
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt
b/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt
index 1f682dd..cfd9338 100644
--- a/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt
+++ b/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlDateFormatter::__construct(): bad timezone or calendar
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/dateformat_create_cal_arg.phpt
b/ext/intl/tests/dateformat_create_cal_arg.phpt
index 8e5f942..7490ece 100644
--- a/ext/intl/tests/dateformat_create_cal_arg.phpt
+++ b/ext/intl/tests/dateformat_create_cal_arg.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlDateFormatter: several forms of the calendar arg
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/dateformat_getCalendarObject_error.phpt
b/ext/intl/tests/dateformat_getCalendarObject_error.phpt
index 22f12cb..d2ad66c 100644
--- a/ext/intl/tests/dateformat_getCalendarObject_error.phpt
+++ b/ext/intl/tests/dateformat_getCalendarObject_error.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlDateFormatter::getCalendarObject(): bad args
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/dateformat_getTimeZone_error.phpt
b/ext/intl/tests/dateformat_getTimeZone_error.phpt
index c9d49fd..4ac5555 100644
--- a/ext/intl/tests/dateformat_getTimeZone_error.phpt
+++ b/ext/intl/tests/dateformat_getTimeZone_error.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlDateFormatter::getTimeZone(): bad args
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/dateformat_get_set_calendar.phpt
b/ext/intl/tests/dateformat_get_set_calendar.phpt
index e792ea3..dbb3e6c 100644
--- a/ext/intl/tests/dateformat_get_set_calendar.phpt
+++ b/ext/intl/tests/dateformat_get_set_calendar.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlDateFormatter: setCalendar()/getCalendar()/getCalendarObject()
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/dateformat_get_set_timezone.phpt
b/ext/intl/tests/dateformat_get_set_timezone.phpt
index 50b036e..b66653d 100644
--- a/ext/intl/tests/dateformat_get_set_timezone.phpt
+++ b/ext/intl/tests/dateformat_get_set_timezone.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlDateFormatter: get/setTimeZone()
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/dateformat_setTimeZoneID_deprecation.phpt
b/ext/intl/tests/dateformat_setTimeZoneID_deprecation.phpt
index ccc477d..5ee5b94 100644
--- a/ext/intl/tests/dateformat_setTimeZoneID_deprecation.phpt
+++ b/ext/intl/tests/dateformat_setTimeZoneID_deprecation.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlDateFormatter: setTimeZoneID() deprecation
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/dateformat_setTimeZone_error.phpt
b/ext/intl/tests/dateformat_setTimeZone_error.phpt
index 8200197..bd37031 100644
--- a/ext/intl/tests/dateformat_setTimeZone_error.phpt
+++ b/ext/intl/tests/dateformat_setTimeZone_error.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlDateFormatter::setTimeZone() bad args
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/dateformat_timezone_arg_variations.phpt
b/ext/intl/tests/dateformat_timezone_arg_variations.phpt
index df3ebd8..ccfb5e1 100644
--- a/ext/intl/tests/dateformat_timezone_arg_variations.phpt
+++ b/ext/intl/tests/dateformat_timezone_arg_variations.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlDateFormatter: several forms of the timezone arg
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/rbbiter___construct_basic.phpt
b/ext/intl/tests/rbbiter___construct_basic.phpt
index 2b14d82..6fb584f 100644
--- a/ext/intl/tests/rbbiter___construct_basic.phpt
+++ b/ext/intl/tests/rbbiter___construct_basic.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlRuleBasedBreakIterator::__construct: basic test
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/rbbiter_getRuleStatusVec_basic.phpt
b/ext/intl/tests/rbbiter_getRuleStatusVec_basic.phpt
index a4f3352..a56f6bc 100644
--- a/ext/intl/tests/rbbiter_getRuleStatusVec_basic.phpt
+++ b/ext/intl/tests/rbbiter_getRuleStatusVec_basic.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlRuleBasedBreakIterator::getRuleStatusVec(): basic test
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/rbbiter_getRuleStatus_basic.phpt
b/ext/intl/tests/rbbiter_getRuleStatus_basic.phpt
index 6199fde..80eedbf 100644
--- a/ext/intl/tests/rbbiter_getRuleStatus_basic.phpt
+++ b/ext/intl/tests/rbbiter_getRuleStatus_basic.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlRuleBasedBreakIterator::getRuleStatus(): basic test
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/rbbiter_getRules_basic.phpt
b/ext/intl/tests/rbbiter_getRules_basic.phpt
index e115e9b..2f7a40e 100644
--- a/ext/intl/tests/rbbiter_getRules_basic.phpt
+++ b/ext/intl/tests/rbbiter_getRules_basic.phpt
@@ -1,5 +1,9 @@
--TEST--
IntlRuleBasedBreakIterator::getRules(): basic test
+--SKIPIF--
+<?php
+if (!extension_loaded('intl'))
+ die('skip intl extension not enabled');
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
