diff options
| author | foobar <sniper@php.net> | 2007-06-06 18:28:13 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2007-06-06 18:28:13 +0000 |
| commit | cb0fd1562584aa43d1fab331b21507fa497924bf (patch) | |
| tree | 58f36cfae4bea1d4042efeaea85be53b80f8f1f6 /Makefile.global | |
| parent | d114d0b0c887fa6343489f7eb88875f75abc1a13 (diff) | |
| download | php-git-cb0fd1562584aa43d1fab331b21507fa497924bf.tar.gz | |
MFH:- Fix passing of shared extensions to run-tests.php
Diffstat (limited to 'Makefile.global')
| -rw-r--r-- | Makefile.global | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.global b/Makefile.global index 453a697993..ebcaf34194 100644 --- a/Makefile.global +++ b/Makefile.global @@ -69,22 +69,26 @@ install-headers: install-su: install-pear +PHP_TEST_SHARED_EXTENSIONS=`(for i in $(PHP_MODULES); do . $$i ; echo -n "-d extension=$$dlname "; done)` +PHP_TEST_SETTINGS=-d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' + test: all -@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \ TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ TEST_PHP_SRCDIR=$(top_srcdir) \ CC="$(CC)" \ - $(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` tests/; \ + $(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -d extension_dir=modules/ $(PHP_TEST_SHARED_EXTENSIONS) tests/; \ elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \ TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ TEST_PHP_SRCDIR=$(top_srcdir) \ CC="$(CC)" \ - $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \ + $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \ else \ echo "ERROR: Cannot run tests without CLI sapi."; \ fi clean: + find . -name \*.gcno -o -name \*.gcda | xargs rm -f find . -name \*.lo -o -name \*.o | xargs rm -f find . -name \*.la -o -name \*.a | xargs rm -f find . -name \*.so | xargs rm -f |