- Fix include_path.

diff --git a/ext/mbstring/tests/bug20087.phpt b/ext/mbstring/tests/bug20087.phpt
index efae733ca2440e93ebcf932f57fba0a983d9c9e3..d2530fa22eb1004dabd7c1fa0b215e6457f268f6 100644 (file)
--- a/ext/mbstring/tests/bug20087.phpt
+++ b/ext/mbstring/tests/bug20087.phpt
@@ -4,7 +4,7 @@ Bug #20087 (Assertion failure)
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
-ini_set('include_path','.');
+ini_set('include_path', dirname(__FILE__));
 include_once('common.inc');
 $testmoo = "blah blah";
 var_dump(mb_parse_str("testmoo"));

diff --git a/ext/mbstring/tests/htmlent.phpt b/ext/mbstring/tests/htmlent.phpt
index e49714ddc2eafedef00c8b918faa2f26326234ec..33c3a5be525293f2680b64bfc81bcbfded628384 100644 (file)
--- a/ext/mbstring/tests/htmlent.phpt
+++ b/ext/mbstring/tests/htmlent.phpt
@@ -2,7 +2,7 @@
 HTML input/output
 --SKIPIF--
 <?php 
-       ini_set('include_path','.'); 
+       ini_set('include_path', dirname(__FILE__)); 
        extension_loaded('mbstring') or die('skip mbstring not available'); 
 ?>
 --INI--

diff --git a/ext/mbstring/tests/mb_convert_encoding.phpt b/ext/mbstring/tests/mb_convert_encoding.phpt
index 9d8a40b9dc04e50a07d3ec69c7c71b678ba93454..1bc7c8673a6b4c38180e1c8b50d30e76c83d3339 100644 (file)
--- a/ext/mbstring/tests/mb_convert_encoding.phpt
+++ b/ext/mbstring/tests/mb_convert_encoding.phpt
@@ -9,7 +9,7 @@ mbstring.language=Japanese
 <?php
 // TODO: Add more tests
 //$debug = true; // Uncomment this line to view error/warning/notice message in *.out file
-ini_set('include_path','.');
+ini_set('include_path', dirname(__FILE__));
 include_once('common.inc');
 
 // SJIS string (BASE64 encoded)

diff --git a/ext/mbstring/tests/mb_convert_variables.phpt b/ext/mbstring/tests/mb_convert_variables.phpt
index 901726bc49a75b63daab9f3237664eba2d0d675f..01ced051044786707609da428f2c0456412d9c43 100644 (file)
--- a/ext/mbstring/tests/mb_convert_variables.phpt
+++ b/ext/mbstring/tests/mb_convert_variables.phpt
@@ -9,7 +9,7 @@ mbstring.language=Japanese
 <?php
 // TODO: Add more tests
 //$debug = true; // Uncomment this line to view error/warning/notice message in *.out file
-ini_set('include_path','.');
+ini_set('include_path', dirname(__FILE__));
 include_once('common.inc');
 
 // SJIS string (BASE64 encoded)

diff --git a/ext/mbstring/tests/mb_detect_encoding.phpt b/ext/mbstring/tests/mb_detect_encoding.phpt
index 79b1a1bd42eda3e85b055ac67d2fb368ed075fe7..4fd22a69c3b534affdfaa4328bfed72b4ff6b883 100644 (file)
--- a/ext/mbstring/tests/mb_detect_encoding.phpt
+++ b/ext/mbstring/tests/mb_detect_encoding.phpt
@@ -8,7 +8,7 @@ mbstring.language=Japanese
 <?php
 // TODO: Add more tests
 //$debug = true; // Uncomment this line to view error/warning/notice message in *.out file
-ini_set('include_path','.');
+ini_set('include_path', dirname(__FILE__));
 include_once('common.inc');
 
 // SJIS string (BASE64 encoded)

diff --git a/ext/mbstring/tests/mb_detect_order.phpt b/ext/mbstring/tests/mb_detect_order.phpt
index bb0ec5653a5d51e68ad58f3aaba26d72f9e77335..382691cfc8dbd982513f64d412025779422ed489 100644 (file)
--- a/ext/mbstring/tests/mb_detect_order.phpt
+++ b/ext/mbstring/tests/mb_detect_order.phpt
@@ -7,7 +7,7 @@ mbstring.language=Japanese
 --FILE--
 <?php
 //$debug = true;
-ini_set('include_path','.');
+ini_set('include_path', dirname(__FILE__));
 include_once('common.inc');
 
 

diff --git a/ext/mbstring/tests/mb_http_input.phpt b/ext/mbstring/tests/mb_http_input.phpt
index fd67a57689dad43fabd8d5a6ef57383634dbfbb3..6e72c5d590fbe4c3810c4a3cbb9b118809d7d130 100644 (file)
--- a/ext/mbstring/tests/mb_http_input.phpt
+++ b/ext/mbstring/tests/mb_http_input.phpt
@@ -14,7 +14,7 @@ b=
 <?php
 // TODO: This is not a real test.... Need to change so that it does real testing
 //$debug = true;
-ini_set('include_path','.');
+ini_set('include_path', dirname(__FILE__));
 include_once('common.inc');
 
 $ini = ini_get('mbstring.http_input');

diff --git a/ext/mbstring/tests/mb_http_output.phpt b/ext/mbstring/tests/mb_http_output.phpt
index 0a6839f7f13aaaf7fdfc1ddd797cf2f38f81600c..7fb3335fe22ba8d86c425bc7bb8b09507151c9e2 100644 (file)
--- a/ext/mbstring/tests/mb_http_output.phpt
+++ b/ext/mbstring/tests/mb_http_output.phpt
@@ -6,7 +6,7 @@ mb_http_output()
 <?php
 //TODO: Add more encoding. Wrong paramter type test.
 //$debug = true;
-ini_set('include_path','.');
+ini_set('include_path', dirname(__FILE__));
 include_once('common.inc');
 
 // Set HTTP output encoding to ASCII

diff --git a/ext/mbstring/tests/mb_internal_encoding.phpt b/ext/mbstring/tests/mb_internal_encoding.phpt
index 1d62962529aa929e974becd27bc852ff34b24558..e1b99c3ba235cb7929a5998ece3253d6c73dc536 100644 (file)
--- a/ext/mbstring/tests/mb_internal_encoding.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding.phpt
@@ -6,7 +6,7 @@ mb_internal_encoding()
 <?php
 // TODO: 
 //$debug = true;
-ini_set('include_path','.');
+ini_set('include_path', dirname(__FILE__));
 include_once('common.inc');
 
 // EUC-JP

diff --git a/ext/mbstring/tests/mb_preferred_mime_name.phpt b/ext/mbstring/tests/mb_preferred_mime_name.phpt
index 82f88b15c3c54a4690a89c2aa3177ec807d77665..9a71ce2757388bc7787b7a1bed0392913100c879 100644 (file)
--- a/ext/mbstring/tests/mb_preferred_mime_name.phpt
+++ b/ext/mbstring/tests/mb_preferred_mime_name.phpt
@@ -7,7 +7,7 @@ mb_preferred_mime_name()
 // TODO: Add more encoding names
 
 //$debug=true;
-ini_set('include_path','.');
+ini_set('include_path', dirname(__FILE__));
 include_once('common.inc');
 
 

diff --git a/ext/mbstring/tests/mb_strcut.phpt b/ext/mbstring/tests/mb_strcut.phpt
index 6a90d87d208294899ee10d47c7f171c3faf50c78..7c78ffe02f2f0a28c39b0b573419c0f5e5a89741 100644 (file)
--- a/ext/mbstring/tests/mb_strcut.phpt
+++ b/ext/mbstring/tests/mb_strcut.phpt
@@ -7,7 +7,7 @@ output_handler=
 --FILE--
 <?php
 // TODO: Add more encodings
-ini_set('include_path','.');
+ini_set('include_path', dirname(__FILE__));
 include_once('common.inc');
 
 // EUC-JP

diff --git a/ext/mbstring/tests/mb_strimwidth.phpt b/ext/mbstring/tests/mb_strimwidth.phpt
index efa98856f13797afc6156b2391123bb82828fc28..82780d6756f2a476abb87b0babeff1613683bec5 100644 (file)
--- a/ext/mbstring/tests/mb_strimwidth.phpt
+++ b/ext/mbstring/tests/mb_strimwidth.phpt
@@ -8,7 +8,7 @@ output_handler=
 <?php
 // TODO: Add more encoding
 //$debug = true;
-ini_set('include_path','.');
+ini_set('include_path', dirname(__FILE__));
 include_once('common.inc');
 
 // EUC-JP

diff --git a/ext/mbstring/tests/mb_strlen.phpt b/ext/mbstring/tests/mb_strlen.phpt
index f93c070134dca91d12da9bd891552c2fd5f3e92b..97c09a79ae41785f1f148f878bd18bc1a531d65c 100644 (file)
--- a/ext/mbstring/tests/mb_strlen.phpt
+++ b/ext/mbstring/tests/mb_strlen.phpt
@@ -9,7 +9,7 @@ mbstring.func_overload=0
 // TODO: Add more encodings
 
 //$debug=true;
-ini_set('include_path','.');
+ini_set('include_path', dirname(__FILE__));
 include_once('common.inc');
 
 // restore detect_order to 'auto'

diff --git a/ext/mbstring/tests/mb_strpos.phpt b/ext/mbstring/tests/mb_strpos.phpt
index ca49599fa70272d359bb86098ffa0a5650137d19..ba235664c96fc66a9e2fc1e588dc316d78f6f328 100644 (file)
--- a/ext/mbstring/tests/mb_strpos.phpt
+++ b/ext/mbstring/tests/mb_strpos.phpt
@@ -7,7 +7,7 @@ mb_strpos()
 // TODO: Add more encodings
 
 //$debug=true;
-ini_set('include_path','.');
+ini_set('include_path', dirname(__FILE__));
 include_once('common.inc');
 
 

diff --git a/ext/mbstring/tests/mb_strwidth.phpt b/ext/mbstring/tests/mb_strwidth.phpt
index 33ec851c3da9bbed67966fb6dd23732fc3a4b9f3..da439b4a205b203b51ad1bf7e143a069375243ec 100644 (file)
--- a/ext/mbstring/tests/mb_strwidth.phpt
+++ b/ext/mbstring/tests/mb_strwidth.phpt
@@ -6,7 +6,7 @@ mb_strwidth()
 <?php
 // TODO: Add more encoding, strings.....
 //$debug = true;
-ini_set('include_path','.');
+ini_set('include_path', dirname(__FILE__));
 include_once('common.inc');
 
 // EUC-JP

diff --git a/ext/mbstring/tests/mb_substitute_character.phpt b/ext/mbstring/tests/mb_substitute_character.phpt
index 9f2131080ede382be2f0233bd07ae48d8a172678..2adfddb10d32a2d277a89e0ce8c67148d6805730 100644 (file)
--- a/ext/mbstring/tests/mb_substitute_character.phpt
+++ b/ext/mbstring/tests/mb_substitute_character.phpt
@@ -5,7 +5,7 @@ mb_substitute_character()
 --FILE--
 <?php
 //$debug = true;
-ini_set('include_path','.');
+ini_set('include_path', dirname(__FILE__));
 include_once('common.inc');
 
 // Note: It does not return TRUE/FALSE for setting char

diff --git a/ext/mbstring/tests/mb_substr.phpt b/ext/mbstring/tests/mb_substr.phpt
index 579e7ffb55c7926d4837a762069336106f280b1b..0dee20174bc7cc6e869a1986ecf8a04e8713e302 100644 (file)
--- a/ext/mbstring/tests/mb_substr.phpt
+++ b/ext/mbstring/tests/mb_substr.phpt
@@ -8,7 +8,7 @@ mbstring.func_overload=0
 --FILE--
 <?php
 // TODO: Add more encodings
-ini_set('include_path','.');
+ini_set('include_path', dirname(__FILE__));
 include_once('common.inc');
 
 // EUC-JP