diff options
| author | Anatol Belski <ab@php.net> | 2017-06-08 17:18:15 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-06-08 17:18:15 +0200 |
| commit | a0338d34908dec47b6f981ce77cef05862f2f263 (patch) | |
| tree | e87ebe53ba9d968f5efb54033f86d179c9c292eb | |
| parent | db4561bfffc348fe99276b059e360eba4c906c4a (diff) | |
| parent | 844f4292ef8e9a750dc6f32eaf8027cd2c6e69da (diff) | |
| download | php-git-a0338d34908dec47b6f981ce77cef05862f2f263.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
enforce exit status propagation and up the sdk version
| -rw-r--r-- | .appveyor.yml | 2 | ||||
| -rw-r--r-- | appveyor/test.bat | 2 | ||||
| -rw-r--r-- | appveyor/test_task.bat | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 68f1bdf86a..0c963b9875 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -24,7 +24,7 @@ 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! diff --git a/appveyor/test.bat b/appveyor/test.bat index ec4b730913..97c526399a 100644 --- a/appveyor/test.bat +++ b/appveyor/test.bat @@ -8,3 +8,5 @@ if not exist "%SDK_RUNNER%" ( call %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\test_task.bat +exit /b %errorlevel% + diff --git a/appveyor/test_task.bat b/appveyor/test_task.bat index 2ba69e9610..d10ee67abb 100644 --- a/appveyor/test_task.bat +++ b/appveyor/test_task.bat @@ -73,3 +73,5 @@ mkdir c:\tests_tmp 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" +exit /b %errorlevel% + |