diff options
| author | Dmitry Stogov <dmitry@php.net> | 2007-07-03 15:56:43 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2007-07-03 15:56:43 +0000 |
| commit | e9d2c517f87f23905340ff756d6fe118876e9590 (patch) | |
| tree | 9fff910fdc25469c18d61b2b21dd9e361551957b | |
| parent | 8387813bd96f53056e97c96315d0fd7bf6cd9611 (diff) | |
| download | php-git-e9d2c517f87f23905340ff756d6fe118876e9590.tar.gz | |
Fixed "make test" mistakes
| -rw-r--r-- | Makefile.global | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.global b/Makefile.global index 75aa1d7b6e..d66da7c27c 100644 --- a/Makefile.global +++ b/Makefile.global @@ -83,15 +83,15 @@ test: all $(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -U -d extension_dir=modules/ $(PHP_TEST_SHARED_EXTENSIONS) tests/; \ elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \ INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`; \ - if test "$(INI_FILE)"; then \ - $(EGREP) -v '^extension[\t\ ]=' "$(INI_FILE)" > $(top_builddir)/tmp-php.ini; \ + if test "$$INI_FILE"; then \ + $(EGREP) -v '^extension[\t\ ]*=' "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \ else \ echo > $(top_builddir)/tmp-php.ini; \ fi; \ TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ TEST_PHP_SRCDIR=$(top_srcdir) \ CC="$(CC)" \ - $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -U -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \ + $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -U -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \ else \ echo "ERROR: Cannot run tests without CLI sapi."; \ fi |