archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Support test-ini also for phpize builds

Browse source 
Automatically generating and using test INI files is supported for
in-tree build (`buildconf`) for a long time, and this can make sense
for phpize builds too, especially when the build extension is a zend
extension, so it can be properly loaded.

Thus we make `--enable-test-ini` and `--with-test-ini-ext-exclude`
available for phpize, but default to false for full BC.

Closes GH-8787.
This commit is contained in:
Christoph M. Becker 2022-06-15 13:25:40 +02:00
parent 3264f2367d
commit c643cbf388
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
3 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
win32/build/Makefile.phpize
View file

@ -42,11 +42,19 @@ _EXTENSION_DLL=$(PECL_TARGETS)
_EXTENSION_DLL=$(EXT_TARGETS) _EXTENSION_DLL=$(EXT_TARGETS)
!endif !endif
!if $(PHP_TEST_INI_PATH) == ""
test: set-tmp-env test: set-tmp-env
$(DEBUGGER_CMD) $(DEBUGGER_ARGS) "$(PHP_PREFIX)\php.exe" -d open_basedir= -d output_buffering=0 run-tests.php $(TESTS) -p "$(PHP_PREFIX)\php.exe" -d extension=$(BUILD_DIR)\$(_EXTENSION_DLL) $(DEBUGGER_CMD) $(DEBUGGER_ARGS) "$(PHP_PREFIX)\php.exe" -d open_basedir= -d output_buffering=0 run-tests.php -p "$(PHP_PREFIX)\php.exe" -d extension=$(BUILD_DIR)\$(_EXTENSION_DLL) $(TESTS)
run: set-tmp-env run: set-tmp-env
$(DEBUGGER_CMD) $(DEBUGGER_ARGS) "$(PHP_PREFIX)\php.exe" -n -d extension=$(BUILD_DIR)\\$(_EXTENSION_DLL) $(ARGS) $(DEBUGGER_CMD) $(DEBUGGER_ARGS) "$(PHP_PREFIX)\php.exe" -n -d extension=$(BUILD_DIR)\\$(_EXTENSION_DLL) $(ARGS)
!else
test: set-tmp-env
$(DEBUGGER_CMD) $(DEBUGGER_ARGS) "$(PHP_PREFIX)\php.exe" -n -d open_basedir= -d output_buffering=0 -d memory_limit=-1 run-tests.php -p "$(PHP_PREFIX)\php.exe" -n -c $(PHP_TEST_INI_PATH) $(TESTS)
run: set-tmp-env
$(DEBUGGER_CMD) $(DEBUGGER_ARGS) "$(PHP_PREFIX)\php.exe" -n -c $(PHP_TEST_INI_PATH) $(ARGS)
!endif
!if $(MT) == "" !if $(MT) == ""
_VC_MANIFEST_EMBED_EXE= _VC_MANIFEST_EMBED_EXE=

6
win32/build/config.w32.phpize.in
View file

@ -130,6 +130,12 @@ DEFINE("PHP_DIR", PHP_DIR);
ARG_WITH("codegen-arch", "Architecture for code generation", "no"); ARG_WITH("codegen-arch", "Architecture for code generation", "no");
toolset_setup_codegen_arch(); toolset_setup_codegen_arch();
ARG_ENABLE("test-ini", "Enable automatic php.ini generation. The test.ini will be put \
into the build dir and used to automatically load the shared extensions.", "no");
ARG_WITH("test-ini-ext-exclude", "Comma separated list of shared extensions to \
be excluded from the test.ini", "no");
ARG_ENABLE("native-intrinsics", "Comma separated list of intrinsic optimizations to enable. \ ARG_ENABLE("native-intrinsics", "Comma separated list of intrinsic optimizations to enable. \
Available optimization names are sse, sse2, sse3, ssse3, sse4.1, sse4.2, avx, avx2. \ Available optimization names are sse, sse2, sse3, ssse3, sse4.1, sse4.2, avx, avx2. \
SSE and SSE2 are enabled by default. The best optimization specified will \ SSE and SSE2 are enabled by default. The best optimization specified will \

12
win32/build/confutils.js
View file

@ -2087,9 +2087,7 @@ function generate_files()
} }
STDOUT.WriteLine("Generating files..."); STDOUT.WriteLine("Generating files...");
if (!MODE_PHPIZE) { generate_tmp_php_ini();
generate_tmp_php_ini();
}
generate_makefile(); generate_makefile();
if (!MODE_PHPIZE) { if (!MODE_PHPIZE) {
generate_internal_functions(); generate_internal_functions();
@ -2532,11 +2530,9 @@ function generate_makefile()
handle_analyzer_makefile_flags(MF, keys[i], val); handle_analyzer_makefile_flags(MF, keys[i], val);
} }
if (!MODE_PHPIZE) { var val = "yes" == PHP_TEST_INI ? PHP_TEST_INI_PATH : "";
var val = "yes" == PHP_TEST_INI ? PHP_TEST_INI_PATH : ""; /* Be sure it's done after generate_tmp_php_ini(). */
/* Be sure it's done after generate_tmp_php_ini(). */ MF.WriteLine("PHP_TEST_INI_PATH=\"" + val + "\"");
MF.WriteLine("PHP_TEST_INI_PATH=\"" + val + "\"");
}
MF.WriteBlankLines(1); MF.WriteBlankLines(1);
if (MODE_PHPIZE) { if (MODE_PHPIZE) {