com php-src: Fixed test: ext/iconv/tests/iconv_basic_00 1.phpt

From: Date: Thu, 25 Dec 2014 11:20:52 +0000
Subject: com php-src: Fixed test: ext/iconv/tests/iconv_basic_00 1.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83863@lists.php.net to get a copy of this message
Commit: 80260bcfa667bf25c65264b129f08a35059436a0 Author: Xinchen Hui <laruence@php.net> Thu, 25 Dec 2014 06:20:52 -0500 Parents: aa394e70ff8cda63ee4382d2488d80936e5122dc Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=80260bcfa667bf25c65264b129f08a35059436a0 Log: Fixed test Changed paths: M ext/iconv/tests/iconv_basic_001.phpt Diff: diff --git a/ext/iconv/tests/iconv_basic_001.phpt b/ext/iconv/tests/iconv_basic_001.phpt index 6fcb5db..079eb67 100644 --- a/ext/iconv/tests/iconv_basic_001.phpt +++ b/ext/iconv/tests/iconv_basic_001.phpt @@ -5,8 +5,10 @@ Rodrigo Prado de Jesus <royopa [at] gmail [dot] com> --SKIPIF-- <?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?> <?php if(substr(PHP_OS, 0, 3) == 'WIN' ) {die('skip not for windows');} ?> +<?php if(setlocale(LC_ALL, "en_US.utf8",) === false) { die('skip en_US.utf8 locales not available'); } ?> --FILE-- <?php +setlocale(LC_ALL, "en_US.utf8"); $in_charset = 'UTF-8'; $out_charset = 'ASCII//TRANSLIT'; $string_to_translate = 'Žluťoučký kůň\n';

« previous php.cvs (#83863) next »