- Fix tests to work with CLI

#- Not totally done, but this makes it a lot better

18 files changed, 19 insertions, 16 deletions

diff --git a/ext/standard/tests/aggregation/aggregate.phpt b/ext/standard/tests/aggregation/aggregate.phpt
index 6fe21f8096..82afb16f70 100644
--- a/ext/standard/tests/aggregation/aggregate.phpt
+++ b/ext/standard/tests/aggregation/aggregate.phpt
@@ -4,7 +4,7 @@ aggregating everything
 --GET--
 --FILE--
 <?php
-include "./aggregate.lib.php";
+include "./ext/standard/tests/aggregation/aggregate.lib.php";
 
 $obj = new simple();
 aggregate($obj, 'helper');
diff --git a/ext/standard/tests/aggregation/aggregate_methods.phpt b/ext/standard/tests/aggregation/aggregate_methods.phpt
index 4cd7db50cf..6567db0069 100644
--- a/ext/standard/tests/aggregation/aggregate_methods.phpt
+++ b/ext/standard/tests/aggregation/aggregate_methods.phpt
@@ -4,7 +4,7 @@ aggregating all methods
 --GET--
 --FILE--
 <?php
-include "./aggregate.lib.php";
+include "./ext/standard/tests/aggregation/aggregate.lib.php";
 
 $obj = new simple();
 aggregate_methods($obj, 'mixin');
diff --git a/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt b/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt
index 390f577f80..fabea1e17f 100644
--- a/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt
+++ b/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt
@@ -4,7 +4,7 @@ aggregating methods specified in the list
 --GET--
 --FILE--
 <?php
-include "./aggregate.lib.php";
+include "./ext/standard/tests/aggregation/aggregate.lib.php";
 
 $obj = new simple();
 aggregate_methods_by_list($obj, 'helper', array('just_another_method'));
diff --git a/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt b/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt
index c229a85b50..1074e02afb 100644
--- a/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt
+++ b/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt
@@ -4,7 +4,7 @@ aggregating methods matching regular expression
 --GET--
 --FILE--
 <?php
-include "./aggregate.lib.php";
+include "./ext/standard/tests/aggregation/aggregate.lib.php";
 
 $obj = new simple();
 aggregate_methods_by_regexp($obj, 'helper', '/^do/');
diff --git a/ext/standard/tests/aggregation/aggregate_properties.phpt b/ext/standard/tests/aggregation/aggregate_properties.phpt
index cee3a4aa74..c035823799 100644
--- a/ext/standard/tests/aggregation/aggregate_properties.phpt
+++ b/ext/standard/tests/aggregation/aggregate_properties.phpt
@@ -4,7 +4,7 @@ aggregating all default properties
 --GET--
 --FILE--
 <?php
-include "./aggregate.lib.php";
+include "./ext/standard/tests/aggregation/aggregate.lib.php";
 
 $obj = new simple();
 aggregate_properties($obj, 'mixin');
diff --git a/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt b/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt
index 53491367e1..187588b29e 100644
--- a/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt
+++ b/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt
@@ -4,7 +4,7 @@ aggregating default properties specified in the list
 --GET--
 --FILE--
 <?php
-include "./aggregate.lib.php";
+include "./ext/standard/tests/aggregation/aggregate.lib.php";
 
 $obj = new simple();
 aggregate_properties_by_list($obj, 'helper', array('my_prop', 'our_prop'));
diff --git a/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt b/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt
index bc8340bfc9..d63f900202 100644
--- a/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt
+++ b/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt
@@ -4,7 +4,7 @@ aggregating default properties matching regular expression
 --GET--
 --FILE--
 <?php
-include "./aggregate.lib.php";
+include "./ext/standard/tests/aggregation/aggregate.lib.php";
 
 $obj = new simple();
 aggregate_properties_by_regexp($obj, 'helper', '/^my/');
diff --git a/ext/standard/tests/aggregation/aggregation_info.phpt b/ext/standard/tests/aggregation/aggregation_info.phpt
index 624a3a3564..f39b7aa373 100644
--- a/ext/standard/tests/aggregation/aggregation_info.phpt
+++ b/ext/standard/tests/aggregation/aggregation_info.phpt
@@ -4,7 +4,7 @@ retrieving aggregation info
 --GET--
 --FILE--
 <?php
-include "./aggregate.lib.php";
+include "./ext/standard/tests/aggregation/aggregate.lib.php";
 
 $obj = new simple();
 aggregate($obj, 'mixin');
diff --git a/ext/standard/tests/aggregation/deaggregate.phpt b/ext/standard/tests/aggregation/deaggregate.phpt
index a807089004..8e1f71eb22 100644
--- a/ext/standard/tests/aggregation/deaggregate.phpt
+++ b/ext/standard/tests/aggregation/deaggregate.phpt
@@ -4,7 +4,7 @@ deaggreating
 --GET--
 --FILE--
 <?php
-include "./aggregate.lib.php";
+include "./ext/standard/tests/aggregation/aggregate.lib.php";
 
 $obj = new simple();
 aggregate($obj, 'helper');
diff --git a/ext/standard/tests/array/001.phpt b/ext/standard/tests/array/001.phpt
index ed92047168..4cc6683e6d 100644
--- a/ext/standard/tests/array/001.phpt
+++ b/ext/standard/tests/array/001.phpt
@@ -4,6 +4,7 @@ Test array_walk, arsort, asort, krsort, ksort, rsort and sort
 --GET--
 --FILE--
 <?php
+chdir(dirname(__FILE__));
 /*
 ** Create sample arrays
 ** Test alpha, numeric (decimal, hex, octal) and special data
diff --git a/ext/standard/tests/array/array_search.phpt b/ext/standard/tests/array/array_search.phpt
index caabaf2a2d..03c03cb2bc 100644
--- a/ext/standard/tests/array/array_search.phpt
+++ b/ext/standard/tests/array/array_search.phpt
@@ -3,7 +3,7 @@ search_array and in_array (including bug 13567)
 --POST--
 --GET--
 --FILE--
-<?php // by jeroen@php.net
+<?php
 
 $arr1 = array('a','b','c');
 $arr2 = array();
@@ -19,7 +19,7 @@ TRUE  === in_array('a', \$arr1)
 'key'=== array_search('d', \$arr4)
 TESTS;
 
- include('../../../../tests/quicktester.inc');
+include('tests/quicktester.inc');
 
 --EXPECT--
 OK
diff --git a/ext/standard/tests/file/001.phpt b/ext/standard/tests/file/001.phpt
index da8fad37a6..8b4ff87850 100644
--- a/ext/standard/tests/file/001.phpt
+++ b/ext/standard/tests/file/001.phpt
@@ -4,6 +4,7 @@ File type functions
 --GET--
 --FILE--
 <?php
+chdir(dirname(__FILE__));
 @unlink('test.file');
 @unlink('test.link');
 if (file_exists('test.file')) {
diff --git a/ext/standard/tests/general_functions/004.phpt b/ext/standard/tests/general_functions/004.phpt
index 0566502ab5..3bd1fb1eac 100644
--- a/ext/standard/tests/general_functions/004.phpt
+++ b/ext/standard/tests/general_functions/004.phpt
@@ -4,6 +4,7 @@ fgetcsv() with tab delimited fields (BUG #8258)
 --GET--
 --FILE--
 <?php 
+chdir(dirname(__FILE__));
 $fp=fopen("004.data","r");
 while($a=fgetcsv($fp,100,"\t")) {
 	echo join(",",$a)."\n";
diff --git a/ext/standard/tests/math/abs.phpt b/ext/standard/tests/math/abs.phpt
index b5ffff37ab..e4e5587897 100644
--- a/ext/standard/tests/math/abs.phpt
+++ b/ext/standard/tests/math/abs.phpt
@@ -20,7 +20,7 @@ $tests = <<<TESTS
 -(LONG_MIN+1) === abs(LONG_MIN+1)
 TESTS;
 
-include('../../../../tests/quicktester.inc');
+include('tests/quicktester.inc');
 --EXPECT--
 1,1,0,0
 OK
diff --git a/ext/standard/tests/math/pow.phpt b/ext/standard/tests/math/pow.phpt
index eb752e3220..3a79a24ef6 100644
--- a/ext/standard/tests/math/pow.phpt
+++ b/ext/standard/tests/math/pow.phpt
@@ -137,7 +137,7 @@ LONG_MIN*LONG_MIN ~== pow(LONG_MIN,2.0)
 TESTS;
 
  echo "On failure, please mail result to php-dev@lists.php.net\n";
- include('../../../../tests/quicktester.inc');
+ include('tests/quicktester.inc');
 
 --EXPECT--
 1,1,0,0
diff --git a/ext/standard/tests/math/round.phpt b/ext/standard/tests/math/round.phpt
index bfb9750f06..49eabed606 100644
--- a/ext/standard/tests/math/round.phpt
+++ b/ext/standard/tests/math/round.phpt
@@ -33,7 +33,7 @@ $tests = <<<TESTS
  LONG_MAX   ~== floor(LONG_MAX + 0.5)
 TESTS;
 
-include('../../../../tests/quicktester.inc');
+include('tests/quicktester.inc');
 --EXPECT--
 1,1,0,0
 OK
diff --git a/ext/standard/tests/strings/trim.phpt b/ext/standard/tests/strings/trim.phpt
index e46512d271..9e9143ca13 100644
--- a/ext/standard/tests/strings/trim.phpt
+++ b/ext/standard/tests/strings/trim.phpt
@@ -23,7 +23,7 @@ $tests = <<<TESTS
 "ABC" === trim("ABC\\x50\\xC1\\x60\\x90","\\x50..\\xC1")
 TESTS;
 
-include('../../../../tests/quicktester.inc');
+include('tests/quicktester.inc');
 
 --EXPECT--
 OK
diff --git a/ext/standard/tests/strings/wordwrap.phpt b/ext/standard/tests/strings/wordwrap.phpt
index ba2f766518..d367b3a82b 100644
--- a/ext/standard/tests/strings/wordwrap.phpt
+++ b/ext/standard/tests/strings/wordwrap.phpt
@@ -29,7 +29,7 @@ $tests = <<<TESTS
 
 TESTS;
 
-include('../../../../tests/quicktester.inc');
+include('tests/quicktester.inc');
 
 --EXPECT--
 OK