diff options
| author | Anatol Belski <ab@php.net> | 2019-03-10 13:56:32 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2019-03-10 13:56:32 +0100 |
| commit | 44b7126c6d86a4cde6d3c2b81161041cf0173743 (patch) | |
| tree | 3a5fb1293dcd8b6bd7fb67e5128ed3220bc685ea | |
| parent | 591d6b86ab547e9ec7dd00780f907ef377c1b9ee (diff) | |
| download | php-git-44b7126c6d86a4cde6d3c2b81161041cf0173743.tar.gz | |
Don't use Opcache with the master test process
Additionally, enable opcache.file_cache to mitigate possible reattach
failures in the tests.
| -rw-r--r-- | win32/build/Makefile | 2 | ||||
| -rw-r--r-- | win32/build/confutils.js | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index 233f38c037..26b73b625a 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -193,7 +193,7 @@ run: set-tmp-env $(DEBUGGER_CMD) $(DEBUGGER_ARGS) "$(BUILD_DIR)\php.exe" $(ARGS) !else test: set-tmp-env - $(DEBUGGER_CMD) $(DEBUGGER_ARGS) "$(BUILD_DIR)\php.exe" -n -c $(PHP_TEST_INI_PATH) -d open_basedir= -d output_buffering=0 -d memory_limit=-1 run-tests.php -p "$(BUILD_DIR)\php.exe" -n -c $(PHP_TEST_INI_PATH) $(TESTS) + $(DEBUGGER_CMD) $(DEBUGGER_ARGS) "$(BUILD_DIR)\php.exe" -n -d open_basedir= -d output_buffering=0 -d memory_limit=-1 run-tests.php -p "$(BUILD_DIR)\php.exe" -n -c $(PHP_TEST_INI_PATH) $(TESTS) run: set-tmp-env $(DEBUGGER_CMD) $(DEBUGGER_ARGS) "$(BUILD_DIR)\php.exe" -n -c $(PHP_TEST_INI_PATH) $(ARGS) diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 384cbde140..bf1a4b7ccc 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -2044,6 +2044,19 @@ function generate_tmp_php_ini() if (!is_on_exclude_list_for_test_ini(ext_list, ext_name)) { INI.WriteLine(directive + "=php_" + ext_name + ".dll"); + + if ("opcache" == ext_name) { + var dir = get_define("BUILD_DIR") + "\\" + "test_file_cache"; + if (FSO.FolderExists(dir)) { + STDOUT.Write(execute("powershell -Command Remove-Item -path \"\\\\?\\" + dir + "\" -recurse")); + } + FSO.CreateFolder(dir); + + /* Fallback is implied, if filecache is enabled. */ + INI.WriteLine("opcache.file_cache=" + dir); + INI.WriteLine("opcache.enable=1"); + INI.WriteLine("opcache.enable_cli=1"); + } } } |