From: Anatol Belski <ab@php.net>
Date: Sat, 29 Oct 2016 00:12:05 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC6~52
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f35078857df0474daba0812307576b2b47e6922;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  generate test ini file, so shared exts are loaded for nmake test
  additional env is generated for phpize, too
---

3f35078857df0474daba0812307576b2b47e6922
diff --cc win32/build/confutils.js
index a534b1eeb8,0914621f3b..391d6c1256
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@@ -2253,18 -2134,20 +2315,24 @@@ function generate_makefile(
  		// The trailing space is needed to prevent the trailing backslash
  		// that is part of the build dir flags (CFLAGS_BD_XXX) from being
  		// seen as a line continuation character
 -		MF.WriteLine(keys[i] + "=" + 
 -			/* \s+\/ eliminates extra whitespace caused when using \ for string continuation,
 -				whereby \/ is the start of the next compiler switch */
 -			trim(configure_subst.Item(keys[i])).replace(/\s+\//gm, " /") + " "
 -			);
 +
 +		/* \s+\/ eliminates extra whitespace caused when using \ for string continuation,
 +			whereby \/ is the start of the next compiler switch */
 +		var val = trim(configure_subst.Item(keys[i])).replace(/\s+\//gm, " /");
 +		
 +		MF.WriteLine(keys[i] + "=" + val + " ");
  		MF.WriteBlankLines(1);
 +
 +		/* If static analyze is enabled, add analyzer specific stuff to the 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_test_php_ini(). */
+ 		MF.WriteLine("PHP_TEST_INI_PATH=\"" + val + "\"");
+ 	}
+ 
  	MF.WriteBlankLines(1);
  	if (MODE_PHPIZE) {
  		var TF = FSO.OpenTextFile(PHP_DIR + "/script/Makefile.phpize", 1);