ssb Mon Apr 16 16:28:58 2001 EDT Modified files: /php4 run-tests.php /php4/build rules.mk Log: * using CGI -C option, you no longer have to specify "full" path to tests Index: php4/run-tests.php diff -u php4/run-tests.php:1.22 php4/run-tests.php:1.23 --- php4/run-tests.php:1.22 Thu Mar 29 04:07:37 2001 +++ php4/run-tests.php Mon Apr 16 16:28:57 2001 @@ -127,7 +127,7 @@ $term_bold = $term_norm = ""; } - $windows_p = (substr(php_uname(), 0, 7) == "Windows"); + $windows_p = (substr(PHP_OS, 0, 3) == "WIN"); if ($windows_p) { if (file_exists('Release_TS_inline\\php.exe')) { $php = 'Release_TS_inline\\php.exe'; @@ -137,8 +137,11 @@ $php=trim($windows_p ? `cd`:`pwd`).'\\php'; } } else { - // $php = $GLOBALS["TOP_BUILDDIR"]."/php"; // where should be the origin of this variable - $php=trim(`pwd`).'/php'; + if (isset($GLOBALS["TOP_BUILDDIR"])) { + $php = $GLOBALS["TOP_BUILDDIR"]."/php"; + } else { + $php = getcwd() . '/php'; + } } create_compiled_in_modules_list(); Index: php4/build/rules.mk diff -u php4/build/rules.mk:1.30 php4/build/rules.mk:1.31 --- php4/build/rules.mk:1.30 Sun Dec 24 08:03:16 2000 +++ php4/build/rules.mk Mon Apr 16 16:28:58 2001 @@ -14,7 +14,7 @@ # | Authors: Sascha Schumann <[EMAIL PROTECTED]> | # +----------------------------------------------------------------------+ # -# $Id: rules.mk,v 1.30 2000/12/24 16:03:16 sas Exp $ +# $Id: rules.mk,v 1.31 2001/04/16 23:28:58 ssb Exp $ # include $(top_srcdir)/build/rules_common.mk @@ -55,9 +55,9 @@ test: $(top_builddir)/php @if test "$(TESTS)" = ""; then \ - TOP_BUILDDIR=$(top_builddir) TOP_SRCDIR=$(top_srcdir) $(top_builddir)/php -d "include_path=.:$(top_srcdir)/pear:$(top_builddir)/pear:$(PEAR_INSTALLDIR)" -q $(top_srcdir)/run-tests.php $(srcdir); \ + TOP_BUILDDIR=$(top_builddir) TOP_SRCDIR=$(top_srcdir) +$(top_builddir)/php -C -q $(top_srcdir)/run-tests.php $(srcdir); \ else \ - TOP_BUILDDIR=$(top_builddir) TOP_SRCDIR=$(top_srcdir) $(top_builddir)/php -d include_path=".:$(top_srcdir)/pear:$(top_builddir)/pear:$(PEAR_INSTALLDIR)" -q $(top_srcdir)/run-tests.php $(TESTS); \ + TOP_BUILDDIR=$(top_builddir) TOP_SRCDIR=$(top_srcdir) +$(top_builddir)/php -C -q $(top_srcdir)/run-tests.php $(TESTS); \ fi include $(builddir)/.deps -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]