From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Thu, 17 Jul 2008 16:30:32 +0000 (+0000)
Subject: - Fix include_path.
X-Git-Tag: php-5.3.0alpha1~300
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85d77510970e708344bcbaca3bc7bd07604193cb;p=php

- Fix include_path.
---

diff --git a/ext/mbstring/tests/bug20087.phpt b/ext/mbstring/tests/bug20087.phpt
index efae733ca2..d2530fa22e 100644
--- 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 e49714ddc2..33c3a5be52 100644
--- 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 9d8a40b9dc..1bc7c8673a 100644
--- 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 901726bc49..01ced05104 100644
--- 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 79b1a1bd42..4fd22a69c3 100644
--- 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 bb0ec5653a..382691cfc8 100644
--- 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 fd67a57689..6e72c5d590 100644
--- 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 0a6839f7f1..7fb3335fe2 100644
--- 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 1d62962529..e1b99c3ba2 100644
--- 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 82f88b15c3..9a71ce2757 100644
--- 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 6a90d87d20..7c78ffe02f 100644
--- 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 efa98856f1..82780d6756 100644
--- 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 f93c070134..97c09a79ae 100644
--- 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 ca49599fa7..ba235664c9 100644
--- 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 33ec851c3d..da439b4a20 100644
--- 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 9f2131080e..2adfddb10d 100644
--- 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 579e7ffb55..0dee20174b 100644
--- 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