cvs: php4 /ext/exif/tests 002.phpt /ext/gmp/tests 002.phpt /ext/session/tests 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt /pear/tests
pear_error.phpt /tests/basic 002.phpt 003.phpt 004.phpt 005.phpt

sander Fri Mar 8 14:16:19 2002 EDT Modified files: /php4/ext/exif/tests 002.phpt /php4/ext/gmp/tests 002.phpt /php4/ext/session/tests 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt /php4/pear/tests pear_error.phpt /php4/tests/basic 002.phpt 003.phpt 004.phpt 005.phpt Log: Fixed many tests, mostly incorrect paths. Index: php4/ext/exif/tests/002.phpt diff -u php4/ext/exif/tests/002.phpt:1.1 php4/ext/exif/tests/002.phpt:1.2 --- php4/ext/exif/tests/002.phpt:1.1 Wed Mar 6 17:01:45 2002 +++ php4/ext/exif/tests/002.phpt Fri Mar 8 14:16:17 2002 @@ -11,16 +11,16 @@ 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 Index: php4/ext/gmp/tests/002.phpt diff -u php4/ext/gmp/tests/002.phpt:1.2 php4/ext/gmp/tests/002.phpt:1.3 --- php4/ext/gmp/tests/002.phpt:1.2 Sun Dec 24 11:51:04 2000 +++ php4/ext/gmp/tests/002.phpt Fri Mar 8 14:16:17 2002 @@ -5,7 +5,7 @@ --POST-- --GET-- --FILE-- -<? +<?php function fact($x) { if($x <= 1) return 1; Index: php4/ext/session/tests/001.phpt diff -u php4/ext/session/tests/001.phpt:1.3 php4/ext/session/tests/001.phpt:1.4 --- php4/ext/session/tests/001.phpt:1.3 Thu Mar 7 15:51:27 2002 +++ php4/ext/session/tests/001.phpt Fri Mar 8 14:16:18 2002 @@ -1,5 +1,7 @@ --TEST-- Session Object Serialization +--SKIPIF-- +<?php include('./ext/session/tests/skipif.inc'); ?> --FILE-- <?php Index: php4/ext/session/tests/002.phpt diff -u php4/ext/session/tests/002.phpt:1.2 php4/ext/session/tests/002.phpt:1.3 --- php4/ext/session/tests/002.phpt:1.2 Sat Oct 6 05:54:23 2001 +++ php4/ext/session/tests/002.phpt Fri Mar 8 14:16:18 2002 @@ -1,5 +1,7 @@ --TEST-- session_unset() without any session +--SKIPIF-- +<?php include('./ext/session/tests/skipif.inc'); ?> --FILE-- <?php session_unset(); Index: php4/ext/session/tests/003.phpt diff -u php4/ext/session/tests/003.phpt:1.5 php4/ext/session/tests/003.phpt:1.6 --- php4/ext/session/tests/003.phpt:1.5 Thu Mar 7 15:51:27 2002 +++ php4/ext/session/tests/003.phpt Fri Mar 8 14:16:18 2002 @@ -1,5 +1,7 @@ --TEST-- Session Object Deserialization +--SKIPIF-- +<?php include('./ext/session/tests/skipif.inc'); ?> --FILE-- <?php Index: php4/ext/session/tests/004.phpt diff -u php4/ext/session/tests/004.phpt:1.6 php4/ext/session/tests/004.phpt:1.7 --- php4/ext/session/tests/004.phpt:1.6 Thu Mar 7 15:51:27 2002 +++ php4/ext/session/tests/004.phpt Fri Mar 8 14:16:18 2002 @@ -1,5 +1,7 @@ --TEST-- session_set_save_handler test +--SKIPIF-- +<?php include('./ext/session/tests/skipif.inc'); ?> --FILE-- <?php error_reporting(~E_NOTICE); Index: php4/ext/session/tests/005.phpt diff -u php4/ext/session/tests/005.phpt:1.4 php4/ext/session/tests/005.phpt:1.5 --- php4/ext/session/tests/005.phpt:1.4 Thu Mar 7 15:51:27 2002 +++ php4/ext/session/tests/005.phpt Fri Mar 8 14:16:18 2002 @@ -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 Index: php4/ext/session/tests/006.phpt diff -u php4/ext/session/tests/006.phpt:1.4 php4/ext/session/tests/006.phpt:1.5 --- php4/ext/session/tests/006.phpt:1.4 Thu Mar 7 15:51:27 2002 +++ php4/ext/session/tests/006.phpt Fri Mar 8 14:16:18 2002 @@ -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); Index: php4/pear/tests/pear_error.phpt diff -u php4/pear/tests/pear_error.phpt:1.20 php4/pear/tests/pear_error.phpt:1.21 --- php4/pear/tests/pear_error.phpt:1.20 Fri Mar 1 22:11:02 2002 +++ php4/pear/tests/pear_error.phpt Fri Mar 8 14:16:18 2002 @@ -137,17 +137,17 @@ 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=""] Index: php4/tests/basic/002.phpt diff -u php4/tests/basic/002.phpt:1.3 php4/tests/basic/002.phpt:1.4 --- php4/tests/basic/002.phpt:1.3 Tue Mar 5 04:02:02 2002 +++ php4/tests/basic/002.phpt Fri Mar 8 14:16:18 2002 @@ -1,5 +1,7 @@ --TEST-- Simple POST Method test +--SKIPIF-- +<?php if(php_sapi_name()=='cli'); echo 'skip'; ?> --POST-- a=Hello+World --GET-- Index: php4/tests/basic/003.phpt diff -u php4/tests/basic/003.phpt:1.2 php4/tests/basic/003.phpt:1.3 --- php4/tests/basic/003.phpt:1.2 Tue Nov 13 07:20:31 2001 +++ php4/tests/basic/003.phpt Fri Mar 8 14:16:19 2002 @@ -1,5 +1,7 @@ --TEST-- GET and POST Method combined +--SKIPIF-- +<?php if(php_sapi_name()=='cli'); echo 'skip'; ?> --POST-- a=Hello+World --GET-- Index: php4/tests/basic/004.phpt diff -u php4/tests/basic/004.phpt:1.2 php4/tests/basic/004.phpt:1.3 --- php4/tests/basic/004.phpt:1.2 Tue Nov 13 07:20:31 2001 +++ php4/tests/basic/004.phpt Fri Mar 8 14:16:19 2002 @@ -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-- Index: php4/tests/basic/005.phpt diff -u php4/tests/basic/005.phpt:1.2 php4/tests/basic/005.phpt:1.3 --- php4/tests/basic/005.phpt:1.2 Tue Nov 13 07:20:31 2001 +++ php4/tests/basic/005.phpt Fri Mar 8 14:16:19 2002 @@ -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--