RE: [PHP-CVS] cvs: php4(php_4_0_4) / run-tests.php /build rules.mk
| From: | James Moore | Date: | Sun, 24 Dec 2000 14:46:16 +0000 |
| Subject: | RE: [PHP-CVS] cvs: php4(php_4_0_4) / run-tests.php /build rules.mk | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-3290@lists.php.net to get a copy of this message | ||
Sascha,
whats the point of this as 4.0.4 has now gone and we will start a new branch
for 4.0.5?
James
--
James Moore
PHP Quality Assurance Team
jmoore@php.net
> -----Original Message-----
> From: Sascha Schumann [mailto:sascha@schumann.cx]
> Sent: 24 December 2000 14:32
> To: php-cvs@lists.php.net
> Subject: [PHP-CVS] cvs: php4(php_4_0_4) / run-tests.php /build rules.mk
>
>
> sas Sun Dec 24 06:31:56 2000 EDT
>
> Modified files: (Branch: php_4_0_4)
> /php4 run-tests.php
> /php4/build rules.mk
> Log:
> Merge test-related changes
>
>
> Index: php4/run-tests.php
> diff -u php4/run-tests.php:1.7.2.1 php4/run-tests.php:1.7.2.2
> --- php4/run-tests.php:1.7.2.1 Sun Dec 3 02:45:57 2000
> +++ php4/run-tests.php Sun Dec 24 06:31:56 2000
> @@ -80,7 +80,7 @@
> if ($windows_p) {
> $php = "./php.exe";
> } else {
> - $php = "./php";
> + $php = $GLOBALS["TOP_BUILDDIR"]."/php";
> }
>
> if (!is_executable($php)) {
> @@ -145,7 +145,7 @@
> }
> }
> } else {
> - $dir = ".";
> + $dir = $GLOBALS["TOP_SRCDIR"];
> }
>
> if ($dir) {
> Index: php4/build/rules.mk
> diff -u php4/build/rules.mk:1.25.2.1 php4/build/rules.mk:1.25.2.2
> --- php4/build/rules.mk:1.25.2.1 Sun Dec 3 02:45:57 2000
> +++ php4/build/rules.mk Sun Dec 24 06:31:56 2000
> @@ -14,7 +14,7 @@
> # | Authors: Sascha Schumann <sascha@schumann.cx>
> |
> #
> +----------------------------------------------------------------------+
> #
> -# $Id: rules.mk,v 1.25.2.1 2000/12/03 10:45:57 hholzgra Exp $
> +# $Id: rules.mk,v 1.25.2.2 2000/12/24 14:31:56 sas 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 -q $(top_srcdir)/run-tests.php
pwd
> + @TOP_BUILDDIR=$(top_builddir) TOP_SRCDIR=$(top_srcdir)
> $(top_builddir)/php -q $(top_srcdir)/run-tests.php $(srcdir)
>
> include $(builddir)/.deps
>
>
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, e-mail: php-cvs-unsubscribe@lists.php.net
> For additional commands, e-mail: php-cvs-help@lists.php.net
> To contact the list administrators, e-mail: php-list-admin@lists.php.net