Fixed many tests, mostly incorrect paths.

13 files changed, 30 insertions, 10 deletions

diff --git a/ext/exif/tests/002.phpt b/ext/exif/tests/002.phpt
index 687090e74e..d9e2298a5d 100644
--- a/ext/exif/tests/002.phpt
+++ b/ext/exif/tests/002.phpt
@@ -11,16 +11,16 @@ Check for exif_thumbnail
   test2.jpg is the same image but contains Exif/Comment information and a
             copy of test1.jpg as a thumbnail.
 */
-$istat= stat('test1.jpg');
-$fp    = fopen('test1.jpg','r');
+$istat= stat('./ext/exif/tests/test1.jpg');
+$fp    = fopen('./ext/exif/tests/test1.jpg','r');
 $image = fread($fp,$istat[7]);
 echo substr($image,490,5).'_'.$istat[7];
 fclose($fp);
-$thumb = exif_thumbnail('test2.jpg');
+$thumb = exif_thumbnail('./ext/exif/tests/test2.jpg');
 echo strcmp($image,$thumb) ? 'different' : '_identical_';
 echo strlen($thumb);
 echo '_'.substr($thumb,490,5);
 /* 7GWgw_523_identical_523_7GWgw */
 ?>
 --EXPECT--
-7GWgw_523_identical_523_7GWgw
\ No newline at end of file
+7GWgw_523_identical_523_7GWgw
diff --git a/ext/gmp/tests/002.phpt b/ext/gmp/tests/002.phpt
index 2f32450474..4e33b6111d 100644
--- a/ext/gmp/tests/002.phpt
+++ b/ext/gmp/tests/002.phpt
@@ -5,7 +5,7 @@ GMP functionality test - factorial
 --POST--
 --GET--
 --FILE--
-<? 
+<?php 
 function fact($x) {
   if($x <= 1) 
         return 1;
diff --git a/ext/session/tests/001.phpt b/ext/session/tests/001.phpt
index 500a930c1e..bd00b51d6b 100644
--- a/ext/session/tests/001.phpt
+++ b/ext/session/tests/001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Session Object Serialization
+--SKIPIF--
+<?php include('./ext/session/tests/skipif.inc'); ?>
 --FILE--
 <?php
 
diff --git a/ext/session/tests/002.phpt b/ext/session/tests/002.phpt
index 0ad61cc926..c7650eee3b 100644
--- a/ext/session/tests/002.phpt
+++ b/ext/session/tests/002.phpt
@@ -1,5 +1,7 @@
 --TEST--
 session_unset() without any session
+--SKIPIF--
+<?php include('./ext/session/tests/skipif.inc'); ?>
 --FILE--
 <?php
 session_unset();
diff --git a/ext/session/tests/003.phpt b/ext/session/tests/003.phpt
index 0bb60f68f4..4dec870fa6 100644
--- a/ext/session/tests/003.phpt
+++ b/ext/session/tests/003.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Session Object Deserialization
+--SKIPIF--
+<?php include('./ext/session/tests/skipif.inc'); ?>
 --FILE--
 <?php
 
diff --git a/ext/session/tests/004.phpt b/ext/session/tests/004.phpt
index 7d0b351f59..12929f37be 100644
--- a/ext/session/tests/004.phpt
+++ b/ext/session/tests/004.phpt
@@ -1,5 +1,7 @@
 --TEST--
 session_set_save_handler test
+--SKIPIF--
+<?php include('./ext/session/tests/skipif.inc'); ?>
 --FILE--
 <?php
 error_reporting(~E_NOTICE);
diff --git a/ext/session/tests/005.phpt b/ext/session/tests/005.phpt
index 7e9701892f..3b82558ebc 100644
--- a/ext/session/tests/005.phpt
+++ b/ext/session/tests/005.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Custom save handler, multiple session_start()s, complex data structure test.
+--SKIPIF--
+<?php include('./ext/session/tests/skipif.inc'); ?>
 --FILE--
 <?php
 
diff --git a/ext/session/tests/006.phpt b/ext/session/tests/006.phpt
index 910aafaa77..e5df22e9c7 100644
--- a/ext/session/tests/006.phpt
+++ b/ext/session/tests/006.phpt
@@ -1,5 +1,7 @@
 --TEST--
 References between variables in sessions
+--SKIPIF--
+<?php include('./ext/session/tests/skipif.inc'); ?>
 --FILE--
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
diff --git a/pear/tests/pear_error.phpt b/pear/tests/pear_error.phpt
index 99510fd0a4..70275dfa33 100644
--- a/pear/tests/pear_error.phpt
+++ b/pear/tests/pear_error.phpt
@@ -137,17 +137,17 @@ mode=print: test error[pear_error: message="test error" code=-42 mode=print leve
 mode=callback(function): errorhandler function called, obj=[pear_error: message="test error" code=-42 mode=callback callback=errorhandler prefix="" info=""]
 mode=callback(method): errorhandler method called, obj=[pear_error: message="test error" code=-42 mode=callback callback=errorclass::errorhandler prefix="" info=""]
 mode=print&trigger: test error
-User Notice: test error in PEAR.php on line 593
+User Notice: test error in PEAR.php on line 591
 [pear_error: message="test error" code=-42 mode=print|trigger level=notice prefix="" info=""]
 mode=trigger:
-User Notice: test error in PEAR.php on line 593
+User Notice: test error in PEAR.php on line 591
 [pear_error: message="test error" code=-42 mode=trigger level=notice prefix="" info=""]
 mode=trigger,level=notice:
-User Notice: test error in PEAR.php on line 593
+User Notice: test error in PEAR.php on line 591
 [pear_error: message="test error" code=-42 mode=trigger level=notice prefix="" info=""]
 mode=trigger,level=warning:
-User Warning: test error in PEAR.php on line 593
+User Warning: test error in PEAR.php on line 591
 [pear_error: message="test error" code=-42 mode=trigger level=warning prefix="" info=""]
 mode=trigger,level=error:
-User Error: test error in PEAR.php on line 593
+User Error: test error in PEAR.php on line 591
 [pear_error: message="test error" code=-42 mode=trigger level=error prefix="" info=""]
diff --git a/tests/basic/002.phpt b/tests/basic/002.phpt
index 48fe5f5be8..9dffe1686a 100644
--- a/tests/basic/002.phpt
+++ b/tests/basic/002.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Simple POST Method test
+--SKIPIF--
+<?php if(php_sapi_name()=='cli'); echo 'skip'; ?>
 --POST--
 a=Hello+World
 --GET--
diff --git a/tests/basic/003.phpt b/tests/basic/003.phpt
index 9c105f7398..dfc714a8fc 100644
--- a/tests/basic/003.phpt
+++ b/tests/basic/003.phpt
@@ -1,5 +1,7 @@
 --TEST--
 GET and POST Method combined
+--SKIPIF--
+<?php if(php_sapi_name()=='cli'); echo 'skip'; ?>
 --POST--
 a=Hello+World
 --GET--
diff --git a/tests/basic/004.phpt b/tests/basic/004.phpt
index b7e50e0f33..694034ae90 100644
--- a/tests/basic/004.phpt
+++ b/tests/basic/004.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Two variables in POST data
+--SKIPIF--
+<?php if(php_sapi_name()=='cli'); echo 'skip'; ?>
 --POST--
 a=Hello+World&b=Hello+Again+World
 --GET--
diff --git a/tests/basic/005.phpt b/tests/basic/005.phpt
index 651b83d81a..d7bd145ccd 100644
--- a/tests/basic/005.phpt
+++ b/tests/basic/005.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Three variables in POST data
+--SKIPIF--
+<?php if(php_sapi_name()=='cli'); echo 'skip'; ?>
 --POST--
 a=Hello+World&b=Hello+Again+World&c=1
 --GET--