From dcc880fb51007b45eb2b5036e5a84edfc198e5c5 Mon Sep 17 00:00:00 2001 From: Gustavo Lopes Date: Tue, 8 Oct 2024 15:24:22 +0100 Subject: [PATCH] Revert unintended change in extension_no_static_tls.phpt (#2879) * Revert unintended change in extension_no_static_tls.phpt * Revert more unintentional test changes --- tests/ext/extension_no_static_tls.phpt | 2 +- tests/ext/live-debugger/exception-replay_001.phpt | 2 +- tests/ext/live-debugger/exception-replay_002.phpt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/ext/extension_no_static_tls.phpt b/tests/ext/extension_no_static_tls.phpt index 6ae89ca2fd..d331e5acae 100644 --- a/tests/ext/extension_no_static_tls.phpt +++ b/tests/ext/extension_no_static_tls.phpt @@ -26,7 +26,7 @@ if (!file_exists('/proc/self/maps')) { die('skip: no /proc/self/maps'); } // 5. Determine in which compilation unit(s) this function is defined $maps = file_get_contents('/proc/self/maps'); -if (preg_match('@(?<=\\s)\\S*/ddtrace\\.so$@m', $maps, $m) != 1) { +if (preg_match('@(?<=\\s)\\S*/ddtrace[^/]*\\.so$@m', $maps, $m) != 1) { die('cannot find loaded ddtrace.so'); } diff --git a/tests/ext/live-debugger/exception-replay_001.phpt b/tests/ext/live-debugger/exception-replay_001.phpt index 604d8e376f..e8cdd472b7 100644 --- a/tests/ext/live-debugger/exception-replay_001.phpt +++ b/tests/ext/live-debugger/exception-replay_001.phpt @@ -8,7 +8,7 @@ DD_AGENT_HOST=request-replayer DD_TRACE_AGENT_PORT=80 DD_TRACE_GENERATE_ROOT_SPAN=0 DD_EXCEPTION_REPLAY_ENABLED=1 -DD_EXCEPTION_REPLAY_RATE_LIMIT_SECONDS=1 +DD_EXCEPTION_REPLAY_CAPTURE_INTERVAL_SECONDS=1 --INI-- datadog.trace.agent_test_session_token=live-debugger/exception-replay_001 --FILE-- diff --git a/tests/ext/live-debugger/exception-replay_002.phpt b/tests/ext/live-debugger/exception-replay_002.phpt index ceec8ac97f..1880a57a5b 100644 --- a/tests/ext/live-debugger/exception-replay_002.phpt +++ b/tests/ext/live-debugger/exception-replay_002.phpt @@ -7,7 +7,7 @@ DD_AGENT_HOST=request-replayer DD_TRACE_AGENT_PORT=80 DD_TRACE_GENERATE_ROOT_SPAN=0 DD_EXCEPTION_REPLAY_ENABLED=1 -DD_EXCEPTION_REPLAY_RATE_LIMIT_SECONDS=1 +DD_EXCEPTION_REPLAY_CAPTURE_INTERVAL_SECONDS=1 --INI-- datadog.trace.agent_test_session_token=live-debugger/exception-replay_002 --FILE--