From: Anatol Belski <ab@php.net>
Date: Thu, 8 Jun 2017 15:18:15 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha2~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0338d34908dec47b6f981ce77cef05862f2f263;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  enforce exit status propagation and up the sdk version
---

a0338d34908dec47b6f981ce77cef05862f2f263
diff --cc .appveyor.yml
index 68f1bdf86a,3b96bd397a..0c963b9875
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@@ -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
diff --cc appveyor/test_task.bat
index 2ba69e9610,77a1902fa5..d10ee67abb
--- a/appveyor/test_task.bat
+++ b/appveyor/test_task.bat
@@@ -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%
+