archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source 
* PHP-8.4:
  Prevent using system DLLs when running the tests
This commit is contained in:
Christoph M. Becker 2025-02-16 23:08:21 +01:00
commit 08ace8409d
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.github/scripts/windows/build_task.bat vendored
View file

@ -5,11 +5,6 @@ if /i "%GITHUB_ACTIONS%" neq "True" (
exit /b 3 exit /b 3
) )
del /f /q C:\Windows\System32\libcrypto-1_1-x64.dll >NUL 2>NUL
if %errorlevel% neq 0 exit /b 3
del /f /q C:\Windows\System32\libssl-1_1-x64.dll >NUL 2>NUL
if %errorlevel% neq 0 exit /b 3
call %~dp0find-target-branch.bat call %~dp0find-target-branch.bat
set STABILITY=staging set STABILITY=staging
set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VS%-%PHP_SDK_ARCH% set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VS%-%PHP_SDK_ARCH%

2
.github/scripts/windows/test_task.bat vendored
View file

@ -141,6 +141,8 @@ editbin /stack:8388608 %PHP_BUILD_DIR%\php-cgi.exe
set TEST_PHPDBG_EXECUTABLE=%PHP_BUILD_DIR%\phpdbg.exe set TEST_PHPDBG_EXECUTABLE=%PHP_BUILD_DIR%\phpdbg.exe
copy /-y %DEPS_DIR%\bin\*.dll %PHP_BUILD_DIR%\*
if "%ASAN%" equ "1" set ASAN_OPTS=--asan if "%ASAN%" equ "1" set ASAN_OPTS=--asan
mkdir c:\tests_tmp mkdir c:\tests_tmp