Skip to content

Commit 5572c82

Browse files
committed
Fix branch variable and test errors
1 parent f708d6d commit 5572c82

File tree

4 files changed

+21
-4
lines changed

4 files changed

+21
-4
lines changed
Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
11
@echo off
22

3-
for /f "usebackq tokens=3" %%i in (`findstr PHP_MAJOR_VERSION main\php_version.h`) do set BRANCH=%%i
4-
for /f "usebackq tokens=3" %%i in (`findstr PHP_MINOR_VERSION main\php_version.h`) do set BRANCH=%BRANCH%.%%i
3+
if /i "%APPVEYOR%" equ "True" (
4+
if /i "%APPVEYOR_REPO_BRANCH:~0,4%" equ "php-" (
5+
set BRANCH=%APPVEYOR_REPO_BRANCH:~4,3%
6+
) else (
7+
set BRANCH=master
8+
)
9+
) else (
10+
if "%GITHUB_BASE_REF%" equ "master" (
11+
set BRANCH=master
12+
)
13+
if "%GITHUB_HEAD_REF%" equ "master" (
14+
set BRANCH=master
15+
)
16+
if "!BRANCH!" equ "" (
17+
for /f "usebackq tokens=3" %%i in (`findstr PHP_MAJOR_VERSION main\php_version.h`) do set BRANCH=%%i
18+
for /f "usebackq tokens=3" %%i in (`findstr PHP_MINOR_VERSION main\php_version.h`) do set BRANCH=%BRANCH%.%%i
19+
)
20+
)

ext/mbstring/tests/utf_encodings.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ mbstring
55
--SKIPIF--
66
<?php
77
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
8+
if (substr(PHP_OS, 0, 3) == 'WIN' && PHP_INT_SIZE === 4) die("skip not for Windows x86");
89
?>
910
--FILE--
1011
<?php

ext/pdo_sqlite/tests/pdo_sqlite_open_basedir_uri.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PDO_sqlite: Testing URIs with open_basedir
33
--EXTENSIONS--
44
pdo_sqlite
55
--INI--
6-
open_basedir={TMP}
6+
open_basedir="{TMP}"
77
--FILE--
88
<?php
99

ext/zend_test/tests/observer_declarations_file_cache.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ zend_test
66
zend_test.observer.enabled=1
77
zend_test.observer.observe_declaring=1
88
opcache.enable_cli=1
9-
opcache.file_cache={TMP}
9+
opcache.file_cache="{TMP}"
1010
opcache.file_cache_only=1
1111
--FILE--
1212
<?php

0 commit comments

Comments
 (0)