Merge branch 'PHP-7.1'

* PHP-7.1: prepend known bin folders to the path for nmake test runs
xuenru · Oct 27, 2016 · 5fa9a6d · 5fa9a6d
2 parents 0a2c02c + 66f3fce
commit 5fa9a6d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git 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
@@ -2334,6 +2334,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();