* all tests should pass now (expect for the interbase stuff that I haven't

had the chance to test)

NEWS

@@ -5,9 +5,9 @@ PHP 4.0                                                                    NEWS
 - Removed support of print $obj automatically calling the __string_value()
   method. Instead define yourself a method such as toString() and use
   print $obj->toString() (Andi, Zend Engine)
-- Added PHP API for Zend's ticks. (Stig)
 
 29 Aug 2000, Version 4.0.2 
+- Added PHP API for Zend's ticks. (Stig)
 - PHP 3 regression testing framework re-born (Stig)
 - Added php_uname() function (Stig)
 - Made a minor change to allow building with OpenLDAP 2.0 (Stig Venaas)

ext/ereg/tests/003.phpt

@@ -7,5 +7,4 @@ ereg_replace single-quote test
   echo ereg_replace("\\\\'","'",$a)
 ?>
 --EXPECT--
-
 'test

ext/ereg/tests/007.phpt

@@ -6,7 +6,7 @@ Test empty result buffer in reg_replace
 <?php 
 	$a="abcd";
 	$b=ereg_replace("abcd","",$a);
-	echo strlen($b);
+	echo "strlen(\$b)=".strlen($b);
 ?>
 --EXPECT--
-0
+strlen($b)=0

ext/standard/tests/file/001.phpt

@@ -88,10 +88,10 @@ if (is_dir('test.link')) {
 } else {
     echo "test.link is not a directory\n";
 }
-if (is_dir('file')) {
-    echo "file is a directory\n";
+if (is_dir('../file')) {
+    echo "../file is a directory\n";
 } else {
-    echo "file is not a directory\n";
+    echo "../file is not a directory\n";
 }
 if (is_dir('test.file')) {
     echo "test.file is a directory\n";
@@ -135,7 +135,7 @@ test.file is not executable
 test.file is a regular file
 test.link is a regular file
 test.link is not a directory
-file is a directory
+../file is a directory
 test.file is not a directory
 test.file does not exist
 test.file does not exist

ext/standard/tests/reg/003.phpt

@@ -7,5 +7,4 @@ ereg_replace single-quote test
   echo ereg_replace("\\\\'","'",$a)
 ?>
 --EXPECT--
-
 'test

ext/standard/tests/reg/007.phpt

@@ -6,7 +6,7 @@ Test empty result buffer in reg_replace
 <?php 
 	$a="abcd";
 	$b=ereg_replace("abcd","",$a);
-	echo strlen($b);
+	echo "strlen(\$b)=".strlen($b);
 ?>
 --EXPECT--
-0
+strlen($b)=0

run-tests.php

@@ -154,14 +154,17 @@ function do_testing($argc, $argv) {
 	}
     }
 
-    if ($total == 0) {
+    $counting = $total - $skipped;
+
+    if ($counting <= 0) {
 	writeln("No tests were run.");
 	return;
     }
 
     $total_d = (double)$total;
-    $passed_p  = 100 * ($passed / $total_d);
-    $failed_p  = 100 * ($failed / $total_d);
+    $counting_d = (double)$counting;
+    $passed_p  = 100 * ($passed / $counting_d);
+    $failed_p  = 100 * ($failed / $counting_d);
     $skipped_p = 100 * ($skipped / $total_d);
     $passed_pstr = sprintf($passed_p < 10.0 ? "%1.1f" : "%3.0f", $passed_p);
     $failed_pstr = sprintf($failed_p < 10.0 ? "%1.1f" : "%3.0f", $failed_p);
@@ -277,9 +280,11 @@ function compare_results($file1, $file2) {
     }
     while (!(feof($fp1) || feof($fp2))) {
 	if (!feof($fp1) && trim($line1 = fgets($fp1, 10240)) != "") {
+	    //print "adding line1 $line1\n";
 	    $data1 .= $line1;
 	}
 	if (!feof($fp2) && trim($line2 = fgets($fp2, 10240)) != "") {
+	    //print "adding line2 $line2\n";
 	    $data2 .= $line2;
 	}
     }

tests/classes/class_example.phpt

@@ -54,34 +54,34 @@ $tmp->display();
 User information
 ----------------
 
-First name:       Zeev
-Family name:      Suraski
-Address:          Ben Gourion 3, Kiryat Bialik, Israel
-Phone:            +972-4-8713139
+First name:	  Zeev
+Family name:	  Suraski
+Address:	  Ben Gourion 3, Kiryat Bialik, Israel
+Phone:		  +972-4-8713139
 
 
 User information
 ----------------
 
-First name:       Andi
-Family name:      Gutmans
-Address:          Haifa, Israel
-Phone:            +972-4-8231621
+First name:	  Andi
+Family name:	  Gutmans
+Address:	  Haifa, Israel
+Phone:		  +972-4-8231621
 
 
 User information
 ----------------
 
-First name:       Andi
-Family name:      Gutmans
-Address:          Haifa, Israel
-Phone:            +972-4-8231621
+First name:	  Andi
+Family name:	  Gutmans
+Address:	  Haifa, Israel
+Phone:		  +972-4-8231621
 
 
 User information
 ----------------
 
-First name:       Andi
-Family name:      Gutmans
-Address:          New address...
-Phone:            +972-4-8231621
+First name:	  Andi
+Family name:	  Gutmans
+Address:	  New address...
+Phone:		  +972-4-8231621

tests/lang/023.phpt

@@ -27,23 +27,17 @@ if ($time_left>0) {
 
 ?>
 --EXPECT--
-
 PHP Regression Test
 
 <html>
 <head>
 
-
 *** Testing assignments and variable aliasing: ***<br>
-
 This should read "blah": blah<br>
-
 This should read "this is nifty": this is nifty<br>
-
 *************************************************<br>
 
 *** Testing integer operators ***<br>
-
 Correct result - 8:  8<br>
 Correct result - 8:  8<br>
 Correct result - 2:  2<br>
@@ -55,7 +49,6 @@ Correct result - 3:  3<br>
 *********************************<br>
 
 *** Testing real operators ***<br>
-
 Correct result - 8:  8<br>
 Correct result - 8:  8<br>
 Correct result - 2:  2<br>
@@ -73,7 +66,6 @@ this_still_works<br>
 should_print<br>
 
 
-
 *** Seriously nested if's test ***<br>
 ** spelling correction by kluzz **
 Only two lines of text should follow:<br>
@@ -85,10 +77,8 @@ this is supposed to be displayed. should be:  $i=2, $j=4.  is:  $i=2, $j=4<br>
 4 4<br>
 **********************************<br>
 
-
 *** C-style else-if's ***<br>
 This should be displayed<br>
-
 *************************<br>
 
 *** WHILE tests ***<br>
@@ -132,7 +122,6 @@ This should be displayed<br>
 37 is greater than 20<br>
 38 is greater than 20<br>
 39 is greater than 20<br>
-
 *******************<br>
 
 
@@ -170,7 +159,6 @@ ${test22}[2] = 6<br>
 
 *** hash test... ***<br>
 commented out...
-
 **************************<br>
 
 *** Hash resizing test ***<br>
@@ -204,7 +192,6 @@ baaaaaaaaa<br>
 2<br>
 baaaaaaaaaa<br>
 1<br>
-
 **************************<br>
 
 
@@ -258,7 +245,6 @@ $k should go from 0 to 2<br>
     $k=1<br>
     $k=2<br>
 $i=2<br>
-
 ***********************<br>
 
 *** Nested file include test ***<br>
@@ -267,9 +253,7 @@ This is Finish.phtml.  This file is supposed to be included
 from regression_test.phtml.  This is normal HTML.
 and this is PHP code, 2+2=4
 </html>
-
 ********************************<br>
 
 Tests completed.<br>
-
 Limor Ullmann is now Limor Baruch :I

tests/lang/028.phpt

@@ -51,11 +51,8 @@ endfor;
 
 $dafna = new dafna_class();
 
-for ($i=0; $i<200; $i++):
 print $name=call_user_method("GetMyName", &$dafna);
 print "\n";
-call_user_method("SetMyName", &$dafna, ++$name);
-endfor;
 
 ?>
 
@@ -1061,202 +1058,4 @@ I'm still alive
 Hey there!!
 199
 Dafna
-Dafnb
-Dafnc
-Dafnd
-Dafne
-Dafnf
-Dafng
-Dafnh
-Dafni
-Dafnj
-Dafnk
-Dafnl
-Dafnm
-Dafnn
-Dafno
-Dafnp
-Dafnq
-Dafnr
-Dafns
-Dafnt
-Dafnu
-Dafnv
-Dafnw
-Dafnx
-Dafny
-Dafnz
-Dafoa
-Dafob
-Dafoc
-Dafod
-Dafoe
-Dafof
-Dafog
-Dafoh
-Dafoi
-Dafoj
-Dafok
-Dafol
-Dafom
-Dafon
-Dafoo
-Dafop
-Dafoq
-Dafor
-Dafos
-Dafot
-Dafou
-Dafov
-Dafow
-Dafox
-Dafoy
-Dafoz
-Dafpa
-Dafpb
-Dafpc
-Dafpd
-Dafpe
-Dafpf
-Dafpg
-Dafph
-Dafpi
-Dafpj
-Dafpk
-Dafpl
-Dafpm
-Dafpn
-Dafpo
-Dafpp
-Dafpq
-Dafpr
-Dafps
-Dafpt
-Dafpu
-Dafpv
-Dafpw
-Dafpx
-Dafpy
-Dafpz
-Dafqa
-Dafqb
-Dafqc
-Dafqd
-Dafqe
-Dafqf
-Dafqg
-Dafqh
-Dafqi
-Dafqj
-Dafqk
-Dafql
-Dafqm
-Dafqn
-Dafqo
-Dafqp
-Dafqq
-Dafqr
-Dafqs
-Dafqt
-Dafqu
-Dafqv
-Dafqw
-Dafqx
-Dafqy
-Dafqz
-Dafra
-Dafrb
-Dafrc
-Dafrd
-Dafre
-Dafrf
-Dafrg
-Dafrh
-Dafri
-Dafrj
-Dafrk
-Dafrl
-Dafrm
-Dafrn
-Dafro
-Dafrp
-Dafrq
-Dafrr
-Dafrs
-Dafrt
-Dafru
-Dafrv
-Dafrw
-Dafrx
-Dafry
-Dafrz
-Dafsa
-Dafsb
-Dafsc
-Dafsd
-Dafse
-Dafsf
-Dafsg
-Dafsh
-Dafsi
-Dafsj
-Dafsk
-Dafsl
-Dafsm
-Dafsn
-Dafso
-Dafsp
-Dafsq
-Dafsr
-Dafss
-Dafst
-Dafsu
-Dafsv
-Dafsw
-Dafsx
-Dafsy
-Dafsz
-Dafta
-Daftb
-Daftc
-Daftd
-Dafte
-Daftf
-Daftg
-Dafth
-Dafti
-Daftj
-Daftk
-Daftl
-Daftm
-Daftn
-Dafto
-Daftp
-Daftq
-Daftr
-Dafts
-Daftt
-Daftu
-Daftv
-Daftw
-Daftx
-Dafty
-Daftz
-Dafua
-Dafub
-Dafuc
-Dafud
-Dafue
-Dafuf
-Dafug
-Dafuh
-Dafui
-Dafuj
-Dafuk
-Daful
-Dafum
-Dafun
-Dafuo
-Dafup
-Dafuq
-Dafur
+