diff options
| author | Anatol Belski <ab@php.net> | 2016-10-27 20:43:25 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-10-27 20:43:25 +0200 |
| commit | 66f3fcee084929a2f0bcc309d312e2956b20b8e4 (patch) | |
| tree | 253d94f6829406a764fbd80d70f661bd4814a371 /win32 | |
| parent | 931ea5c872a0a4455c5bbb8470c7a1d049bd8501 (diff) | |
| parent | 1be8339891be8a60ad66b9128f13aa8c8b94c580 (diff) | |
| download | php-git-66f3fcee084929a2f0bcc309d312e2956b20b8e4.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
prepend known bin folders to the path for nmake test runs
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/Makefile | 2 | ||||
| -rw-r--r-- | win32/build/confutils.js | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index 33f145f269..813d92a086 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -151,7 +151,7 @@ clean-pgo: clean-all -del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip -del /f /q $(BUILD_DIR)\php-test-pack-$(PHP_VERSION_STRING).zip -test: +test: set-test-env "$(BUILD_DIR)\php.exe" -d open_basedir= -d output_buffering=0 run-tests.php $(TESTS) -p "$(BUILD_DIR)\php.exe" build-snap: generated_files diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 1641b362f8..ab8719a002 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -2312,6 +2312,21 @@ function generate_makefile() } TF.Close(); + MF.WriteBlankLines(1); + + var extra_path = PHP_PHP_BUILD + "\\bin"; + if (PHP_EXTRA_LIBS.length) { + path = PHP_EXTRA_LIBS.split(';'); + for (i = 0; i < path.length; i++) { + f = FSO.GetAbsolutePathName(path[i] + "\\..\\bin"); + if (FSO.FolderExists(f)) { + extra_path = extra_path + ";" + f; + } + } + } + MF.WriteLine("set-test-env:"); + MF.WriteLine(" @set PATH=" + extra_path + ";%PATH%"); + MF.WriteBlankLines(2); MFO.Close(); |