Skip to content

Commit 074196b

Browse files
committed
Fix tests
Signed-off-by: Bob Weinand <[email protected]>
1 parent e6d023c commit 074196b

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

components-rs/sidecar.h

+4
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ void ddog_ph_file_drop(struct ddog_NativeFile ph);
3333

3434
ddog_MaybeError ddog_alloc_anon_shm_handle(uintptr_t size, struct ddog_ShmHandle **handle);
3535

36+
ddog_MaybeError ddog_alloc_anon_shm_handle_named(uintptr_t size,
37+
struct ddog_ShmHandle **handle,
38+
ddog_CharSlice name);
39+
3640
ddog_MaybeError ddog_map_shm(struct ddog_ShmHandle *handle,
3741
struct ddog_MappedMem_ShmHandle **mapped,
3842
void **pointer,

tests/ext/request-replayer/dd_trace_agent_env.phpt

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
--TEST--
2-
DDTrace\ExceptionSpanEvent serialization with overridden attributes
2+
Assert that the default environment can be read from agent info
33
--SKIPIF--
44
<?php include __DIR__ . '/../includes/skipif_no_dev_env.inc'; ?>
55
<?php
6-
echo "nocache\n";
6+
if (PHP_VERSION_ID >= 80100) {
7+
echo "nocache\n";
8+
}
79
$ctx = stream_context_create([
810
'http' => [
911
'method' => 'PUT',
@@ -28,7 +30,11 @@ datadog.trace.agent_test_session_token=dd_trace_agent_env
2830
<?php
2931

3032
$span = \DDTrace\start_span();
31-
usleep(500000);
33+
if (getenv('USE_ZEND_ALLOC') === '0' && !getenv("SKIP_ASAN")) {
34+
sleep(3); // timing sensitive
35+
} else {
36+
sleep(1);
37+
}
3238
\DDTrace\close_span();
3339
var_dump($span->env);
3440

0 commit comments

Comments
 (0)