Merge branch 'PHP-7.1'

* PHP-7.1:
  rename the tmp ini file, to keep it consistent with m4 variant
This commit is contained in:
Anatol Belski 2016-11-04 18:44:14 +01:00
commit 74ce3edbfd

View file

@ -1906,7 +1906,7 @@ function generate_tmp_php_ini()
}
var ini_dir = PHP_OBJECT_OUT_DIR + ("yes" == PHP_DEBUG ? "Debug" : "Release") + ("yes" == PHP_ZTS ? "_TS" : "");
PHP_TEST_INI_PATH = ini_dir + "\\test.ini";
PHP_TEST_INI_PATH = ini_dir + "\\tmp-php.ini";
if (FSO.FileExists(PHP_TEST_INI_PATH)) {
STDOUT.WriteLine("Generating " + PHP_TEST_INI_PATH + " ...");