cvs: php4(php_4_0_4) / run-tests.php /build rules.mk
| From: | Sascha Schumann | Date: | Sun, 24 Dec 2000 14:31:56 +0000 |
| Subject: | cvs: php4(php_4_0_4) / run-tests.php /build rules.mk | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-3289@lists.php.net to get a copy of this message | ||
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