cvs: php4(php_4_0_4) / run-tests.php /build rules.mk /tests README

hholzgra Sun Dec 3 02:45:58 2000 EDT Branch: php_4_0_4 Modified files: /php4 run-tests.php /php4/tests README /php4/build rules.mk Log: changed run-tests.php to use 'php -q' instead of 'php -f' Index: php4/run-tests.php diff -u php4/run-tests.php:1.7 php4/run-tests.php:1.7.2.1 --- php4/run-tests.php:1.7 Sun Oct 29 00:19:35 2000 +++ php4/run-tests.php Sun Dec 3 02:45:57 2000 @@ -124,11 +124,11 @@ global $term, $windows_p, $php, $skip, $testdirs, $tmpfile, $opts, $skipped, $failed, $passed, $total, $term_bold, $term_norm; - if ($argc > 0) { - if (is_dir($argv[0])) { - $dir = $argv[0]; + if ($argc > 1) { + if (is_dir($argv[1])) { + $dir = $argv[1]; } else { - for ($i = 0; $i < $argc; $i++) { + for ($i = 1; $i < $argc; $i++) { switch (run_test($argv[$i])) { case TEST_SKIPPED: case TEST_INTERNAL_ERROR: Index: php4/tests/README diff -u php4/tests/README:1.1 php4/tests/README:1.1.2.1 --- php4/tests/README:1.1 Sun Aug 27 12:46:04 2000 +++ php4/tests/README Sun Dec 3 02:45:57 2000 @@ -2,17 +2,17 @@ ==================== To run the tests, go to the top-level directory and -run "./php -f run-tests.php". +run "./php -q run-tests.php". Without parameters, "run-tests.php" will recursively scan through the file tree looking for directories called "tests", and run all the tests (.phpt files) within (recursively). To run tests in a single directory, pass the directory as a parameter: -"./php -f run-tests.php tests/lang". +"./php -q run-tests.php tests/lang". To run one or more single tests, pass them as parameters: -"./php -f run-tests.php tests/lang/015.phpt". +"./php -q run-tests.php tests/lang/015.phpt". The format of the .phpt files is quite simple. There are 6 possible sections. Test, Skipif, Post, Get, File and Expect. The Test section Index: php4/build/rules.mk diff -u php4/build/rules.mk:1.25 php4/build/rules.mk:1.25.2.1 --- php4/build/rules.mk:1.25 Tue Aug 29 02:12:44 2000 +++ php4/build/rules.mk Sun Dec 3 02:45:57 2000 @@ -14,7 +14,7 @@ # | Authors: Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: rules.mk,v 1.25 2000/08/29 09:12:44 ssb Exp $ +# $Id: rules.mk,v 1.25.2.1 2000/12/03 10:45:57 hholzgra Exp $ # include $(top_srcdir)/build/rules_common.mk @@ -54,7 +54,7 @@ php_config.h stamp-h Makefile build-defs.h php4.spec libphp4.module test: $(top_builddir)/php - @$(top_builddir)/php -f $(top_srcdir)/run-tests.php pwd + @$(top_builddir)/php -q $(top_srcdir)/run-tests.php pwd include $(builddir)/.deps