cvs: php4 / configure.in run-tests.php /build rules.mk rules_common.mk
| From: | Stig Bakken | Date: | Tue, 29 Aug 2000 09:12:44 +0000 |
| Subject: | cvs: php4 / configure.in run-tests.php /build rules.mk rules_common.mk | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1442@lists.php.net to get a copy of this message | ||
ssb Tue Aug 29 02:12:44 2000 EDT
Modified files:
/php4 configure.in run-tests.php
/php4/build rules.mk rules_common.mk
Log:
* Added "test" make target so you can do "make test" in any directory.
* Added copyright header to run-test.php
Index: php4/configure.in
diff -u php4/configure.in:1.169 php4/configure.in:1.170
--- php4/configure.in:1.169 Fri Aug 25 01:15:08 2000
+++ php4/configure.in Tue Aug 29 02:12:44 2000
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.169 2000/08/25 08:15:08 sas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.170 2000/08/29 09:12:44 ssb Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -552,7 +552,6 @@
fi
PHP_OUTPUT(pear/pear)
-PHP_OUTPUT(pear/run-tests)
PHP_OUTPUT(pear/phpize)
PHP_OUTPUT(pear/php-config)
PHP_OUTPUT(pear/PEAR.php)
Index: php4/run-tests.php
diff -u php4/run-tests.php:1.1 php4/run-tests.php:1.2
--- php4/run-tests.php:1.1 Sun Aug 27 12:45:58 2000
+++ php4/run-tests.php Tue Aug 29 02:12:44 2000
@@ -1,16 +1,37 @@
<?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);
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;
Index: php4/build/rules.mk
diff -u php4/build/rules.mk:1.24 php4/build/rules.mk:1.25
--- php4/build/rules.mk:1.24 Fri Aug 25 01:15:10 2000
+++ php4/build/rules.mk Tue Aug 29 02:12:44 2000
@@ -14,7 +14,7 @@
# | Authors: Sascha Schumann <sascha@schumann.cx> |
# +----------------------------------------------------------------------+
#
-# $Id: rules.mk,v 1.24 2000/08/25 08:15:10 sas Exp $
+# $Id: rules.mk,v 1.25 2000/08/29 09:12:44 ssb Exp $
#
include $(top_srcdir)/build/rules_common.mk
@@ -52,6 +52,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
Index: php4/build/rules_common.mk
diff -u php4/build/rules_common.mk:1.2 php4/build/rules_common.mk:1.3
--- php4/build/rules_common.mk:1.2 Sun Aug 20 01:58:19 2000
+++ php4/build/rules_common.mk Tue Aug 29 02:12:44 2000
@@ -14,7 +14,7 @@
# | Authors: Sascha Schumann <sascha@schumann.cx> |
# +----------------------------------------------------------------------+
#
-# $Id: rules_common.mk,v 1.2 2000/08/20 08:58:19 sas Exp $
+# $Id: rules_common.mk,v 1.3 2000/08/29 09:12:44 ssb Exp $
#
include $(top_builddir)/config_vars.mk
@@ -37,7 +37,7 @@
moduledir = $(EXTENSION_DIR)
CXX_SUFFIX = .cpp
-
+
.SUFFIXES:
.SUFFIXES: .slo .c $(CXX_SUFFIX) .lo .o .s .y .l