]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Thu, 8 Jun 2017 15:18:15 +0000 (17:18 +0200)
committerAnatol Belski <ab@php.net>
Thu, 8 Jun 2017 15:18:15 +0000 (17:18 +0200)
* PHP-7.1:
  enforce exit status propagation and up the sdk version

1  2 
.appveyor.yml
appveyor/test.bat
appveyor/test_task.bat

diff --cc .appveyor.yml
index 68f1bdf86a5e364af6c615e2bad2cf7560e3e359,3b96bd397ae6af5a1cb4e321fd5666f0ae2fc1e3..0c963b9875e84bf27aa9628bcf478941f7f66e36
@@@ -24,8 -24,7 +24,8 @@@ environment
          PHP_BUILD_CACHE_BASE_DIR: c:\build-cache  
          PHP_BUILD_OBJ_DIR: c:\obj
          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
          # ext and env setup for tests
          #MYSQL_TEST_PASSWD: Password12!
          #MYSQL_TEST_USER: root
Simple merge
index 2ba69e9610b3efcafc972a86b5410c96d73a0d63,77a1902fa5f0241bcbd1e22032b096327e67f16a..d10ee67abb10eb54efacea89ead888e620f3c73d
@@@ -71,5 -71,7 +71,7 @@@ copy %PHP_BUILD_CACHE_ENCHANT_DICT_DIR%
  mkdir c:\tests_tmp
  
  cd "%APPVEYOR_BUILD_FOLDER%"
 -nmake test TESTS="%OPCACHE_OPTS% -q --offline --show-diff --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%