* Added "test" make target so you can do "make test" in any directory.

* Added copyright header to run-test.php

diff --git a/build/rules.mk b/build/rules.mk
index 86ec3af37e3a9f4f45b88f58e03b2649fd2912e3..4699e32a501c6f2fb00c91734b9c7a0551c84647 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -53,6 +53,9 @@ distclean: distclean-recursive clean-x
        rm -f config.cache config.log config.status config_vars.mk libtool \
        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`
+
 include $(builddir)/.deps
 
 .PHONY: all-recursive clean-recursive install-recursive \

diff --git a/build/rules_common.mk b/build/rules_common.mk
index 5c2b7129bed079413369067374460fb16dacda51..6e8cf24d22bee26ce7c546edac78d10e252c791e 100644 (file)
--- a/build/rules_common.mk
+++ b/build/rules_common.mk
@@ -37,7 +37,7 @@ DEFS = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/main
 moduledir    = $(EXTENSION_DIR)
 
 CXX_SUFFIX = .cpp
-       
+
 .SUFFIXES:
 .SUFFIXES: .slo .c $(CXX_SUFFIX) .lo .o .s .y .l
 

diff --git a/configure.in b/configure.in
index b210957be752483c3d8c44d89ddaa83bc98a187e..78ef857f85a336ca5130c755197ab27334340cf7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -552,7 +552,6 @@ if test "$PHP_PEAR" = "yes"; then
 fi
 
 PHP_OUTPUT(pear/pear)
-PHP_OUTPUT(pear/run-tests)
 PHP_OUTPUT(pear/phpize)
 PHP_OUTPUT(pear/php-config)
 PHP_OUTPUT(pear/PEAR.php)

diff --git a/run-tests.php b/run-tests.php
index b80c4b72b3ba2cf56241043bb4ccddc0b9c15337..2bb1898479b26ec7a9b20de25de51e742e44df06 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -1,4 +1,23 @@
 <?php
+/*
+   +----------------------------------------------------------------------+
+   | PHP version 4.0                                                      |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.02 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_02.txt.                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Stig Bakken <ssb@fast.no>                                   |
+   | (based on the PHP 3 test framework by Rasmus Lerdorf)                |
+   +----------------------------------------------------------------------+
+ */
+
 
 define('TEST_PASSED', 0);
 define('TEST_FAILED', -1);
@@ -6,11 +25,13 @@ define('TEST_SKIPPED', -2);
 define('TEST_INTERNAL_ERROR', -3);
 
 initialize();
+/*
 $opts = parse_options(&$argc, &$argv);
 if ($opts['help']) {
     usage();
     exit;
 }
+*/
 do_testing($argc, &$argv);
 
 exit;