diff options
| author | y-uti <y.uchiyama.1015@gmail.com> | 2016-03-28 19:50:31 +0900 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-07-25 09:46:06 +0200 |
| commit | 0f9bf85ad9a18a5cbd314f00030626f2d21be49e (patch) | |
| tree | 6faf178a121ecfa55e89a0a01fa1ab51daec52db | |
| parent | 6ed71363714a6225a69d748d3b8ab2e565e1ea44 (diff) | |
| download | php-git-0f9bf85ad9a18a5cbd314f00030626f2d21be49e.tar.gz | |
Enable 'nmake test' on building extensions
On Windows, Makefile generated by phpize doesn't have the 'test'
target rule. This commit fixes that and enables 'nmake test' on
Windows.
| -rw-r--r-- | win32/build/Makefile | 1 | ||||
| -rw-r--r-- | win32/build/Makefile.phpize | 9 | ||||
| -rw-r--r-- | win32/build/phpize.js.in | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index 06f8ef35d5..245643b160 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -195,6 +195,7 @@ build-lib: build-ext-libs build-devel: build-headers build-lib @if not exist $(BUILD_DIR_DEV)\script mkdir $(BUILD_DIR_DEV)\script >nul @if not exist $(BUILD_DIR_DEV)\build mkdir $(BUILD_DIR_DEV)\build >nul + @copy run-tests.php $(BUILD_DIR_DEV)\script\ /y >nul @copy win32\build\confutils.js $(BUILD_DIR_DEV)\script\ /y >nul @copy win32\build\configure.tail $(BUILD_DIR_DEV)\script\ /y >nul @copy win32\build\config.w32.phpize.in $(BUILD_DIR_DEV)\script\ /y >nul diff --git a/win32/build/Makefile.phpize b/win32/build/Makefile.phpize index cd74336039..d3b89c9195 100644 --- a/win32/build/Makefile.phpize +++ b/win32/build/Makefile.phpize @@ -28,6 +28,15 @@ clean: clean-pecl @for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @del /F /Q %D\*.* > NUL
-@del /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk $(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip > NUL
+!if "$(EXT_TARGETS)" == "" +_EXTENSION_DLL=$(PECL_TARGETS) +!else +_EXTENSION_DLL=$(EXT_TARGETS) +!endif + +test: + "$(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) + !if $(MT) == ""
_VC_MANIFEST_EMBED_EXE=
_VC_MANIFEST_EMBED_DLL=
diff --git a/win32/build/phpize.js.in b/win32/build/phpize.js.in index e610897b4c..f3fc8c48d5 100644 --- a/win32/build/phpize.js.in +++ b/win32/build/phpize.js.in @@ -262,3 +262,5 @@ C.Write(file_get_contents(PHP_DIR + "\\script\\configure.tail")); B.WriteLine("@echo off");
B.WriteLine("cscript /nologo configure.js %*");
+ +FSO.CopyFile(PHP_DIR + "\\script\\run-tests.php", "run-tests.php", true); |