Skip to content

Commit 16bec78

Browse files
committed
FOR REBASE copy .github/scripts/windows/* from PHP 8.0
1 parent a2dcb03 commit 16bec78

File tree

2 files changed

+9
-28
lines changed

2 files changed

+9
-28
lines changed

.github/scripts/windows/build_task.bat

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ if %errorlevel% neq 0 exit /b 3
5151
if "%THREAD_SAFE%" equ "0" set ADD_CONF=%ADD_CONF% --disable-zts
5252
if "%INTRINSICS%" neq "" set ADD_CONF=%ADD_CONF% --enable-native-intrinsics=%INTRINSICS%
5353

54+
set EXT_EXCLUDE_FROM_TEST=snmp,oci8_12c,pdo_oci,pdo_firebird,ldap,imap,ftp
55+
if "%OPCACHE%" equ "0" set EXT_EXCLUDE_FROM_TEST=%EXT_EXCLUDE_FROM_TEST%,opcache
56+
5457
set CFLAGS=/W1 /WX
5558

5659
cmd /c configure.bat ^
@@ -61,7 +64,7 @@ cmd /c configure.bat ^
6164
--enable-object-out-dir=%PHP_BUILD_OBJ_DIR% ^
6265
--with-php-build=%DEPS_DIR% ^
6366
%ADD_CONF% ^
64-
--disable-test-ini
67+
--with-test-ini-ext-exclude=%EXT_EXCLUDE_FROM_TEST%
6568
if %errorlevel% neq 0 exit /b 3
6669

6770
nmake /NOLOGO

.github/scripts/windows/test_task.bat

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,8 @@ rem set OPENSSL_CONF=%OPENSSLDIR%\openssl.cnf
6262
set OPENSSL_CONF=
6363
rem set SSLEAY_CONF=
6464

65-
rem prepare for OPcache
65+
rem prepare for Opcache
6666
if "%OPCACHE%" equ "1" set OPCACHE_OPTS=-d opcache.enable=1 -d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=16M
67-
rem work-around for failing to dl(mysqli) with OPcache (https://github.com/php/php-src/issues/8508)
68-
if "%OPCACHE%" equ "1" set OPCACHE_OPTS=%OPCACHE_OPTS% -d extension=mysqli
6967

7068
rem prepare for enchant
7169
mkdir C:\usr\local\lib\enchant-2
@@ -91,39 +89,19 @@ if not exist "%PHP_BUILD_CACHE_ENCHANT_DICT_DIR%\en_US.aff" (
9189
mkdir %LOCALAPPDATA%\enchant\hunspell
9290
copy %PHP_BUILD_CACHE_ENCHANT_DICT_DIR%\* %LOCALAPPDATA%\enchant\hunspell
9391

94-
set PHP_BUILD_DIR=%PHP_BUILD_OBJ_DIR%\Release
95-
if "%THREAD_SAFE%" equ "1" set PHP_BUILD_DIR=%PHP_BUILD_DIR%_TS
96-
97-
mkdir %PHP_BUILD_DIR%\test_file_cache
98-
rem generate php.ini
99-
echo extension_dir=%PHP_BUILD_DIR% > %PHP_BUILD_DIR%\php.ini
100-
echo opcache.file_cache=%PHP_BUILD_DIR%\test_file_cache >> %PHP_BUILD_DIR%\php.ini
101-
if "%OPCACHE%" equ "1" echo zend_extension=php_opcache.dll >> %PHP_BUILD_DIR%\php.ini
102-
rem work-around for some spawned PHP processes requiring OpenSSL
103-
echo extension=php_openssl.dll >> %PHP_BUILD_DIR%\php.ini
104-
105-
rem remove ext dlls for which tests are not supported
106-
for %%i in (imap ldap oci8_12c pdo_firebird pdo_oci snmp) do (
107-
del %PHP_BUILD_DIR%\php_%%i.dll
108-
)
109-
110-
set TEST_PHPDBG_EXECUTABLE=%PHP_BUILD_DIR%\phpdbg.exe
92+
set TEST_PHPDBG_EXECUTABLE=%PHP_BUILD_OBJ_DIR%\Release
93+
if "%THREAD_SAFE%" equ "1" set TEST_PHPDBG_EXECUTABLE=%TEST_PHPDBG_EXECUTABLE%_TS
94+
set TEST_PHPDBG_EXECUTABLE=%TEST_PHPDBG_EXECUTABLE%\phpdbg.exe
11195

11296
mkdir c:\tests_tmp
11397

11498
set TEST_PHP_JUNIT=c:\junit.out.xml
11599

116100
cd "%APPVEYOR_BUILD_FOLDER%"
117-
nmake test TESTS="%OPCACHE_OPTS% -q --offline --show-diff --show-slow 1000 --set-timeout 120 --temp-source c:\tests_tmp --temp-target c:\tests_tmp --bless %PARALLEL%"
101+
nmake test TESTS="%OPCACHE_OPTS% -q --offline --show-diff --show-slow 1000 --set-timeout 120 --temp-source c:\tests_tmp --temp-target c:\tests_tmp %PARALLEL%"
118102

119103
set EXIT_CODE=%errorlevel%
120104

121105
appveyor PushArtifact %TEST_PHP_JUNIT%
122106

123-
if %EXIT_CODE% GEQ 1 (
124-
git checkout ext\pgsql\tests\config.inc
125-
git diff > bless_tests.patch
126-
appveyor PushArtifact bless_tests.patch
127-
)
128-
129107
exit /b %EXIT_CODE%

0 commit comments

Comments
 (0)