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

diff --cc win32/build/config.w32
Simple merge

diff --cc win32/build/confutils.js
index a534b1eeb822ea2dba40f47c8bb4f6642f5aeaad,0914621f3b9bc08e5b89879b1a388d9b23713c04..391d6c12561a2f755fe58ad2e1017e86b41e8733
--- 1/win32/build/confutils.js
--- 2/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);