Fixed "make test"

diff --git a/Makefile.global b/Makefile.global
index d66da7c27cfe32c2c0d2e26ffb537c368ebac6b8..401b1b996945f202245adb22b97d8afa86b47f2b 100644 (file)
--- a/Makefile.global
+++ b/Makefile.global
@@ -98,22 +98,32 @@ test: all
 
 utest: all
        -@if test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
-               $(EGREP) -v '^extension[\t\ ]=' `$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo (php_ini_loaded_file()) ? php_ini_loaded_file() : "no_ini_file";'` > $(top_builddir)/tmp-php.ini; \
+               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; \
+               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
 
 ntest: all
        -@if test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
-               $(EGREP) -v '^extension[\t\ ]=' `$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo (php_ini_loaded_file()) ? php_ini_loaded_file() : "no_ini_file";'` > $(top_builddir)/tmp-php.ini; \
+               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; \
+               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 -N -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 -N -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
        else \
                echo "ERROR: Cannot run tests without CLI sapi."; \
        fi

diff --git a/run-tests.php b/run-tests.php
index 37301870b1b931397d2ae2bc4b4aa38dbc404032..0ef93b14b0c81356e8ca8c4f5c3ca1497e8ec732 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -1231,7 +1231,7 @@ TEST $file
                                $env['USE_ZEND_ALLOC'] = '1';
                        }
 
-                       $output = system_with_timeout("$extra $php -q $ini_settings $test_skipif", $env);
+                       $output = system_with_timeout("$extra $php $pass_options -q $ini_settings $test_skipif", $env);
                        if (!$cfg['keep']['skip']) {
                                @unlink($test_skipif);
                        }
@@ -1462,7 +1462,7 @@ COMMAND $cmd
                                settings2params($clean_params);
                                $extra = substr(PHP_OS, 0, 3) !== "WIN" ?
                                        "unset REQUEST_METHOD; unset QUERY_STRING; unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;": "";
-                               system_with_timeout("$extra $php -q $clean_params $test_clean", $env);
+                               system_with_timeout("$extra $php $pass_options -q $clean_params $test_clean", $env);
                        }
                        if (!$cfg['keep']['clean']) {
                                @unlink($test_clean);