Skip to content

Commit 1615100

Browse files
committed
Skip Win specific tests
1 parent 3a0fb13 commit 1615100

File tree

5 files changed

+9
-18
lines changed

5 files changed

+9
-18
lines changed

.github/workflows/windows.yml

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,15 @@ jobs:
3232
build_type: ['ts', 'nts']
3333

3434
include:
35-
- php: ['7.0', '7.1']
35+
- php: '7.0'
3636
vc_num: 14
3737
vc_prefix: 'vc'
3838
os: windows-2016
3939

40-
# vc_num: 14
41-
# vc_prefix: 'vc'
42-
# os: windows-2016
40+
- php: '7.1'
41+
vc_num: 14
42+
vc_prefix: 'vc'
43+
os: windows-2016
4344

4445
- php: '7.2'
4546
vc_num: 15
@@ -117,20 +118,6 @@ jobs:
117118
uses: ilammy/msvc-dev-cmd@v1
118119
with:
119120
arch: ${{ matrix.arch }}
120-
# toolset: ${{ matrix.vc_num }}
121-
# shell: cmd
122-
# run: |
123-
# SET VSWHERE="C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere"
124-
# SET VSCMD_SKIP_SENDTELEMETRY=No way
125-
126-
# for /f "usebackq tokens=*" %%i in (`%VSWHERE% -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
127-
# set InstallDir=%%i
128-
# )
129-
130-
# if exist "%InstallDir%\Common7\Tools\vsdevcmd.bat" (
131-
# echo "Found %InstallDir%\Common7\Tools\vsdevcmd.bat"
132-
# call "%InstallDir%\Common7\Tools\vsdevcmd.bat" %*
133-
# ) else "VC not found"
134121

135122
- name: Set PHP SDK Environment variables
136123
shell: cmd

tests/base/cblocks.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Tests recognizing wrapping C-code in CBLOCKs
33
--SKIPIF--
44
<?php include(__DIR__ . '/../skipif.inc'); ?>
5+
<?php include(__DIR__ . '/../skipifwin32.inc'); ?>
56
--FILE--
67
<?php
78

tests/comments/comments_before.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Comments before namespace
33
--SKIPIF--
44
<?php include(__DIR__ . '/../skipif.inc'); ?>
5+
<?php include(__DIR__ . '/../skipifwin32.inc'); ?>
56
--FILE--
67
<?php
78

tests/errors/bug30.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Syntax error when use unicode
33
--SKIPIF--
44
<?php include(__DIR__ . '/../skipif.inc'); ?>
5+
<?php include(__DIR__ . '/../skipifwin32.inc'); ?>
56
--FILE--
67
<?php
78

tests/skipifwin32.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<?php if (stripos(PHP_OS, "WIN") === 0) print "skip Windows specific test with CRLF"; ?>

0 commit comments

Comments
 (0)