Skip to content

Commit fa8e2eb

Browse files
committed
test: fix remaining tests
Signed-off-by: Alexandre Rulleau <[email protected]>
1 parent 78dd4fb commit fa8e2eb

File tree

4 files changed

+19
-7
lines changed

4 files changed

+19
-7
lines changed

.gitlab/generate-shared.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@
114114
- CMAKE_PREFIX_PATH=/opt/catch2 Tea_ROOT=../../tmp/tea/<?= $switch_php_version ?> cmake <?= $toolchain ?> -DCMAKE_BUILD_TYPE=Debug -DBUILD_ZAI_TESTING=ON -DPhpConfig_ROOT=$(php-config --prefix) ../../zend_abstract_interface
115115
- make -j all
116116
- make test
117+
- cat Testing/Temporary/LastTest.log
117118
- grep -e "=== Total [0-9]+ memory leaks detected ===" Testing/Temporary/LastTest.log && exit 1 || true
118119
<?php
119120
endforeach;

datadog-setup.php

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -549,12 +549,12 @@ function install($options)
549549
$tar_gz_suffix = ""; // retry with the full archive if the original download failed
550550
}
551551
}
552-
if (!IS_WINDOWS || `where tar 2> nul` !== null) {
552+
if (!IS_WINDOWS || shell_exec("where tar 2> nul") !== null) {
553553
execute_or_exit(
554554
"Cannot extract the archive",
555555
"tar -xf " . escapeshellarg($tmpDirTarGz) . " -C " . escapeshellarg($tmpDir)
556556
);
557-
} elseif (($defaultPath = `where 7z 2> nul`) !== null || @is_dir($installDir7z = getenv("PROGRAMFILES") . "\\7-Zip")) {
557+
} elseif (($defaultPath = shell_exec("where 7z 2> nul")) !== null || @is_dir($installDir7z = getenv("PROGRAMFILES") . "\\7-Zip")) {
558558
if ($defaultPath === null) {
559559
putenv("PATH=" . getenv("PATH") . ";$installDir7z");
560560
}
@@ -638,7 +638,13 @@ function install($options)
638638
// Trace
639639
$extensionRealPath = "$tmpArchiveTraceRoot/ext/$extensionVersion/"
640640
. EXTENSION_PREFIX . "ddtrace$extensionSuffix." . EXTENSION_SUFFIX;
641+
642+
$extensionRealPath2 = "$tmpArchiveTraceRoot";
643+
if (!file_exists($extensionRealPath)) {
644+
var_dump("ALED");
645+
}
641646
if (!file_exists($extensionRealPath)) {
647+
var_dump($extensionRealPath);
642648
print_error_and_exit(substr($extensionSuffix ?: '-nts', 1)
643649
. ' builds of PHP ' . $phpProperties[PHP_VER] . ' are currently not supported');
644650
}
@@ -1541,7 +1547,12 @@ function download($url, $destination, $retry = false)
15411547
// PHP doesn't like too long location headers, and on PHP 7.3 and older they weren't read at all.
15421548
// But this only really matters for CircleCI artifacts, so not too bad.
15431549
if ($data == "") {
1544-
foreach ($http_response_header as $header) {
1550+
if (PHP_VERSION_ID >= 80500) {
1551+
$headers = http_get_last_response_headers();
1552+
} else {
1553+
$headers = $http_response_header;
1554+
}
1555+
foreach ($headers as $header) {
15451556
if (stripos($header, "location: ") === 0) {
15461557
$data = file_get_contents(substr($header, 10));
15471558
goto got_data;

loader/dd_library_loader.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "php_dd_library_loader.h"
1717

1818
#define MIN_API_VERSION 320151012
19-
#define MAX_API_VERSION 420240925
19+
#define MAX_API_VERSION 420250925
2020
#define MAX_INI_API_VERSION MAX_API_VERSION + 1
2121

2222
#define PHP_70_VERSION 20151012

tooling/bin/generate-final-artifact.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ tmp_folder_final=$tmp_folder/final
1313

1414
architectures=(x86_64 aarch64)
1515

16-
php_apis=(20190902 20200930 20210902 20220829 20230831 20240924)
16+
php_apis=(20190902 20200930 20210902 20220829 20230831 20240924 20250925)
1717
if [[ -z ${DDTRACE_MAKE_PACKAGES_ASAN:-} ]]; then
1818
php_apis+=(20151012 20160303 20170718 20180731)
1919
fi
@@ -183,7 +183,7 @@ for architecture in "${architectures[@]}"; do
183183
########################
184184
if [[ -z ${DDTRACE_MAKE_PACKAGES_ASAN:-} ]]; then
185185
# Extension
186-
php_apis=(20160303 20170718 20180731 20190902 20200930 20210902 20220829 20230831 20240924)
186+
php_apis=(20160303 20170718 20180731 20190902 20200930 20210902 20220829 20230831 20240924 20250925)
187187
for version in "${php_apis[@]}"
188188
do
189189
for full_target in "${targets[@]}"; do
@@ -242,7 +242,7 @@ for architecture in "${architectures[@]}"; do
242242
tmp_folder_final_musl_appsec=$tmp_folder_final_musl/dd-library-php/appsec
243243

244244
# Extensions
245-
php_apis=(20151012 20160303 20170718 20180731 20190902 20200930 20210902 20220829 20230831 20240924);
245+
php_apis=(20151012 20160303 20170718 20180731 20190902 20200930 20210902 20220829 20230831 20240924 20250925);
246246
for php_api in "${php_apis[@]}"; do
247247
for full_target in "${targets[@]}"; do
248248
target=${full_target#*-}

0 commit comments

Comments
 (0)