Skip to content

Commit

Permalink
Revert unintended change in extension_no_static_tls.phpt (#2879)
Browse files Browse the repository at this point in the history
* Revert unintended change in extension_no_static_tls.phpt

* Revert more unintentional test changes
  • Loading branch information
cataphract authored Oct 8, 2024
1 parent e1405d2 commit dcc880f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion tests/ext/extension_no_static_tls.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}

Expand Down
2 changes: 1 addition & 1 deletion tests/ext/live-debugger/exception-replay_001.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -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--
Expand Down
2 changes: 1 addition & 1 deletion tests/ext/live-debugger/exception-replay_002.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -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--
Expand Down

0 comments on commit dcc880f

Please sign in to comment.