changed run-tests.php to use 'php -q' instead of 'php -f'

diff --git a/build/rules.mk b/build/rules.mk
index 4699e32a501c6f2fb00c91734b9c7a0551c84647..8459f6c0e65d19163eaa23bc4d9659d74d68938a 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -54,7 +54,7 @@ distclean: distclean-recursive clean-x
        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
 

diff --git a/run-tests.php b/run-tests.php
index 3f90d4251b0f14680a0a5f8973231c08f2144a55..00d252ff608ba724ddc3c6ade6f503216878c463 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -124,11 +124,11 @@ function do_testing($argc, &$argv) {
     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:

diff --git a/tests/README b/tests/README
index b9b0622ecfdb293449d6c0b3ae7bea359d6ee329..3c739c2fa921ecc5c235b26cc3676aab40102a72 100755 (executable)
--- a/tests/README
+++ b/tests/README
@@ -2,17 +2,17 @@ PHP Regression Tests
 ====================
 
 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