archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.1'

Browse source 
* PHP-7.1:
  enforce exit status propagation and up the sdk version
This commit is contained in:
Anatol Belski 2017-06-08 17:18:15 +02:00
commit a0338d3490
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.appveyor.yml
View file

@ -24,7 +24,7 @@ environment:
PHP_BUILD_CACHE_BASE_DIR: c:\build-cache PHP_BUILD_CACHE_BASE_DIR: c:\build-cache
PHP_BUILD_OBJ_DIR: c:\obj PHP_BUILD_OBJ_DIR: c:\obj
PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
PHP_BUILD_SDK_BRANCH: php-sdk-2.0.4 PHP_BUILD_SDK_BRANCH: php-sdk-2.0.5
PHP_BUILD_CRT: vc15 PHP_BUILD_CRT: vc15
# ext and env setup for tests # ext and env setup for tests
#MYSQL_TEST_PASSWD: Password12! #MYSQL_TEST_PASSWD: Password12!

2
appveyor/test.bat
View file

@ -8,3 +8,5 @@ if not exist "%SDK_RUNNER%" (
call %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\test_task.bat call %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\test_task.bat
exit /b %errorlevel%

2
appveyor/test_task.bat
View file

@ -73,3 +73,5 @@ mkdir c:\tests_tmp
cd "%APPVEYOR_BUILD_FOLDER%" cd "%APPVEYOR_BUILD_FOLDER%"
nmake test TESTS="%OPCACHE_OPTS% -q --offline --show-diff --show-slow 1000 --set-timeout 120 -g FAIL,XFAIL,BORK,WARN,LEAK,SKIP --temp-source c:\tests_tmp --temp-target c:\tests_tmp" nmake test TESTS="%OPCACHE_OPTS% -q --offline --show-diff --show-slow 1000 --set-timeout 120 -g FAIL,XFAIL,BORK,WARN,LEAK,SKIP --temp-source c:\tests_tmp --temp-target c:\tests_tmp"
exit /b %errorlevel%