- Fix tests assuming wrong ini options and extensions that might not be there

diff --git a/Zend/tests/bug50174.phpt b/Zend/tests/bug50174.phpt
index 6ed5733b67e79af478491132dde4026dfdcfc669..fef65136ba8e58432b1ddd960011919294cfd9b2 100644 (file)
--- a/Zend/tests/bug50174.phpt
+++ b/Zend/tests/bug50174.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #50174 (Incorrectly matched docComment)
+--SKIPIF--
+<?php if (!extension_loaded('reflection') || !extension_loaded('spl')) print "skip"; ?>
 --FILE--
 <?php
 

diff --git a/ext/iconv/tests/iconv_encoding_basic.phpt b/ext/iconv/tests/iconv_encoding_basic.phpt
index 150f49b590fa45a1f6d01eb68a4807153d06b44b..746858161c817fece5681778fabfdf3094b0b06d 100644 (file)
--- a/ext/iconv/tests/iconv_encoding_basic.phpt
+++ b/ext/iconv/tests/iconv_encoding_basic.phpt
@@ -5,6 +5,10 @@ Test iconv_get_encoding()/iconv_set_encoding() function : basic functionality
 extension_loaded('iconv') or die('skip');
 function_exists('iconv_get_encoding') or die("skip iconv_get_encoding() is not available in this build");
 ?>
+--INI--
+iconv.input_encoding=ISO-8859-1
+iconv.internal_encoding=ISO-8859-1
+iconv.output_encoding=ISO-8859-1
 --FILE--
 <?php
 /* Prototype  : mixed iconv_get_encoding([string type])
@@ -91,4 +95,4 @@ array(3) {
   ["internal_encoding"]=>
   string(5) "UTF-8"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/iconv/tests/iconv_substr_basic.phpt b/ext/iconv/tests/iconv_substr_basic.phpt
index b8db8a124f61c5826eb8350fde2d78849079452a..0754fc8779dab7f6f033f7f4bf510239b4250b12 100644 (file)
--- a/ext/iconv/tests/iconv_substr_basic.phpt
+++ b/ext/iconv/tests/iconv_substr_basic.phpt
@@ -5,6 +5,10 @@ Test iconv_substr() function : basic functionality
 extension_loaded('iconv') or die('skip');
 function_exists('iconv_substr') or die("skip iconv_substr() is not available in this build");
 ?>
+--INI--
+iconv.input_encoding=ISO-8859-1
+iconv.internal_encoding=ISO-8859-1
+iconv.output_encoding=ISO-8859-1
 --FILE--
 <?php
 /* Prototype  : string iconv_substr(string str, int offset, [int length, string charset])
@@ -52,4 +56,4 @@ string(14) "a5e69cace8aa9e"
 
 -- Multibyte string 2 --
 string(42) "e8aa9ee38386e382ade382b9e38388e381a7e38199"
-Done
\ No newline at end of file
+Done