Skip to content

Support test-ini also for phpize builds #8787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cmb69 wants to merge 1 commit into from
Closed

Support test-ini also for phpize builds #8787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion win32/build/Makefile.phpize
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,19 @@ _EXTENSION_DLL=$(PECL_TARGETS)
_EXTENSION_DLL=$(EXT_TARGETS)
!endif

!if $(PHP_TEST_INI_PATH) == ""
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
$(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) == ""
_VC_MANIFEST_EMBED_EXE=
Expand Down
6 changes: 6 additions & 0 deletions win32/build/config.w32.phpize.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,12 @@ DEFINE("PHP_DIR", PHP_DIR);
ARG_WITH("codegen-arch", "Architecture for code generation", "no");
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. \
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 \
Expand Down
12 changes: 4 additions & 8 deletions win32/build/confutils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2083,9 +2083,7 @@ function generate_files()
}

STDOUT.WriteLine("Generating files...");
if (!MODE_PHPIZE) {
generate_tmp_php_ini();
}
generate_tmp_php_ini();
generate_makefile();
if (!MODE_PHPIZE) {
generate_internal_functions();
Expand Down Expand Up @@ -2528,11 +2526,9 @@ function generate_makefile()
handle_analyzer_makefile_flags(MF, keys[i], val);
}

if (!MODE_PHPIZE) {
var val = "yes" == PHP_TEST_INI ? PHP_TEST_INI_PATH : "";
/* Be sure it's done after generate_tmp_php_ini(). */
MF.WriteLine("PHP_TEST_INI_PATH=\"" + val + "\"");
}
var val = "yes" == PHP_TEST_INI ? PHP_TEST_INI_PATH : "";
/* Be sure it's done after generate_tmp_php_ini(). */
MF.WriteLine("PHP_TEST_INI_PATH=\"" + val + "\"");

MF.WriteBlankLines(1);
if (MODE_PHPIZE) {
Expand Down