cvs: php4 / run-tests.php /build rules.mk
| From: | Sascha Schumann | Date: | Sun, 24 Dec 2000 14:24:04 +0000 |
| Subject: | cvs: php4 / run-tests.php /build rules.mk | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-3288@lists.php.net to get a copy of this message | ||
sas Sun Dec 24 06:24:04 2000 EDT
Modified files:
/php4 run-tests.php
/php4/build rules.mk
Log:
Fix "make test" in VPATH environments
Index: php4/run-tests.php
diff -u php4/run-tests.php:1.14 php4/run-tests.php:1.15
--- php4/run-tests.php:1.14 Fri Dec 15 15:18:50 2000
+++ php4/run-tests.php Sun Dec 24 06:24:04 2000
@@ -95,7 +95,7 @@
$php = "./php.exe";
}
} else {
- $php = "./php";
+ $php = $GLOBALS["TOP_BUILDDIR"]."/php";
}
if (!is_executable($php)) {
@@ -162,7 +162,7 @@
}
}
} else {
- $dir = ".";
+ $dir = $GLOBALS["TOP_SRCDIR"];
}
if (isset($dir) && $dir) {
Index: php4/build/rules.mk
diff -u php4/build/rules.mk:1.28 php4/build/rules.mk:1.29
--- php4/build/rules.mk:1.28 Wed Dec 13 06:01:39 2000
+++ php4/build/rules.mk Sun Dec 24 06:24:04 2000
@@ -14,7 +14,7 @@
# | Authors: Sascha Schumann <sascha@schumann.cx> |
# +----------------------------------------------------------------------+
#
-# $Id: rules.mk,v 1.28 2000/12/13 14:01:39 ssb Exp $
+# $Id: rules.mk,v 1.29 2000/12/24 14:24:04 sas Exp $
#
include $(top_srcdir)/build/rules_common.mk
@@ -55,9 +55,9 @@
test: $(top_builddir)/php
@if test "$(TESTS)" = ""; then \
- $(top_builddir)/php -d include_path=".:$(top_srcdir)/pear:$(PEAR_INSTALLDIR)" -q
$(top_srcdir)/run-tests.php
pwd; \
+ TOP_BUILDDIR=$(top_builddir) TOP_SRCDIR=$(top_srcdir) $(top_builddir)/php -d
include_path=".:$(top_srcdir)/pear:$(PEAR_INSTALLDIR)" -q $(top_srcdir)/run-tests.php
$(top_srcdir); \
else \
- $(top_builddir)/php -d include_path=".:$(top_srcdir)/pear:$(PEAR_INSTALLDIR)" -q
$(top_srcdir)/run-tests.php $(TESTS); \
+ TOP_BUILDDIR=$(top_builddir) TOP_SRCDIR=$(top_srcdir) $(top_builddir)/php -d
include_path=".:$(top_srcdir)/pear:$(PEAR_INSTALLDIR)" -q $(top_srcdir)/run-tests.php
$(TESTS); \
fi
include $(builddir)/.deps