cvs: php4 / run-tests.php /ext/db/tests .cvsignore

ssb Thu Dec 14 18:57:12 2000 EDT Modified files: /php4 run-tests.php /php4/ext/db/tests .cvsignore Log: * run-tests.php: fixed a few bugs, including the POST/GET problem reported by Stas Index: php4/run-tests.php diff -u php4/run-tests.php:1.12 php4/run-tests.php:1.13 --- php4/run-tests.php:1.12 Wed Dec 13 06:24:15 2000 +++ php4/run-tests.php Thu Dec 14 18:57:11 2000 @@ -46,11 +46,11 @@ function usage() { - writeln("Usage: run-tests.php [-d] [-h] [dir|file...]"); + dowriteln("Usage: run-tests.php [-d] [-h] [dir|file...]"); } /* - * Please use write() and writeln() for all screen output. + * Please use dowrite() and dowriteln() for all screen output. * This makes it easier to convert to HTML output later. */ @@ -264,7 +264,8 @@ $total++; } if ($oskipped + (isset($tests_in_dir[$dir])?$tests_in_dir[$dir]:0) == $skipped) { - dowriteln("[all $skipped test(s) skipped]"); + $skippednow = $skipped - $oskipped; + dowriteln("[all $skippednow test(s) skipped]"); } dowriteln(""); return true; @@ -407,10 +408,6 @@ putenv("CONTENT_TYPE="); putenv("CONTENT_LENGTH="); } - putenv("a="); - putenv("b="); - putenv("c="); - putenv("d="); if (isset($fps["POST"])) { $cmd = "$php -q $tmpfile[FILE] < $tmpfile[POST]"; } else { @@ -418,13 +415,13 @@ } $ofp = @fopen($tmpfile["OUTPUT"], "w"); if (!$ofp) { - writeln("Error: could not write to output file"); + dowriteln("Error: could not write to output file"); delete_tmpfiles(); return TEST_INTERNAL_ERROR; } $cp = popen($cmd, "r"); if (!$cp) { - writeln("Error: could not execute: $cmd"); + dowriteln("Error: could not execute: $cmd"); delete_tmpfiles(); return TEST_INTERNAL_ERROR; } Index: php4/ext/db/tests/.cvsignore diff -u php4/ext/db/tests/.cvsignore:1.1 php4/ext/db/tests/.cvsignore:1.2 --- php4/ext/db/tests/.cvsignore:1.1 Tue Nov 21 00:00:07 2000 +++ php4/ext/db/tests/.cvsignore Thu Dec 14 18:57:11 2000 @@ -2,3 +2,4 @@ *.out *.php phpt.* +test.dbm*