Merge branch 'PHP-7.1'

* PHP-7.1:
  fix test run with autogenerated ini
This commit is contained in:
Anatol Belski 2016-10-29 03:18:43 +02:00
commit 5ada01ee75

View File

@ -156,7 +156,7 @@ test: set-test-env
"$(BUILD_DIR)\php.exe" -d open_basedir= -d output_buffering=0 run-tests.php $(TESTS) -p "$(BUILD_DIR)\php.exe"
!else
test: set-test-env
"$(BUILD_DIR)\php.exe" -c $(PHP_TEST_INI_PATH) -d open_basedir= -d output_buffering=0 run-tests.php $(TESTS) -p "$(BUILD_DIR)\php.exe"
"$(BUILD_DIR)\php.exe" -n -c $(PHP_TEST_INI_PATH) -d open_basedir= -d output_buffering=0 -d memory_limit=-1 run-tests.php -p "$(BUILD_DIR)\php.exe" -n -c $(PHP_TEST_INI_PATH) $(TESTS)
!endif
build-snap: generated_files