Skip to content

Commit f8fafad

Browse files
merge allocations & time combined test to "normal" path
1 parent 52876ec commit f8fafad

File tree

1 file changed

+2
-21
lines changed

1 file changed

+2
-21
lines changed

.github/workflows/prof_correctness.yml

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
export DD_PROFILING_EXCEPTION_MESSAGE_ENABLED=1
7878
php -v
7979
php -d extension=target/profiler-release/libdatadog_php_profiling.so --ri datadog-profiling
80-
for test_case in "allocations" "time" "strange_frames" "timeline" "exceptions"; do
80+
for test_case in "allocations" "time" "strange_frames" "timeline" "exceptions" "allocation_time_combined"; do
8181
mkdir -p profiling/tests/correctness/"$test_case"/
8282
export DD_PROFILING_OUTPUT_PPROF=$PWD/profiling/tests/correctness/"$test_case"/test.pprof
8383
php -d extension="${PWD}/target/profiler-release/libdatadog_php_profiling.so" "profiling/tests/correctness/${test_case}.php"
@@ -95,7 +95,7 @@ jobs:
9595
export DD_PROFILING_EXCEPTION_MESSAGE_ENABLED=1
9696
php -v
9797
php -d extension=target/profiler-release/libdatadog_php_profiling.so --ri datadog-profiling
98-
for test_case in "allocations" "time" "strange_frames" "timeline" "exceptions"; do
98+
for test_case in "allocations" "time" "strange_frames" "timeline" "exceptions" "allocation_time_combined"; do
9999
mkdir -p profiling/tests/correctness/"$test_case"/
100100
export DD_PROFILING_OUTPUT_PPROF=$PWD/profiling/tests/correctness/"$test_case"/test.pprof
101101
php -d extension=$PWD/target/profiler-release/libdatadog_php_profiling.so profiling/tests/correctness/"$test_case".php
@@ -110,25 +110,6 @@ jobs:
110110
USE_ZEND_ALLOC=0 php -d extension=$PWD/target/profiler-release/libdatadog_php_profiling.so profiling/tests/correctness/allocations.php
111111
unset DD_PROFILING_ALLOCATION_SAMPLING_DISTANCE
112112
113-
- name: Run allocation_time_combined test (PHP 8.4+)
114-
run: |
115-
export DD_PROFILING_LOG_LEVEL=trace
116-
export DD_PROFILING_EXPERIMENTAL_FEATURES_ENABLED=1
117-
export DD_PROFILING_EXPERIMENTAL_EXCEPTION_SAMPLING_DISTANCE=1
118-
export DD_PROFILING_EXCEPTION_MESSAGE_ENABLED=1
119-
php -v
120-
php -d extension=target/profiler-release/libdatadog_php_profiling.so --ri datadog-profiling
121-
mkdir -p profiling/tests/correctness/allocation_time_combined/
122-
export DD_PROFILING_OUTPUT_PPROF=$PWD/profiling/tests/correctness/allocation_time_combined/test.pprof
123-
export DD_PROFILING_ALLOCATION_ENABLED=yes
124-
export DD_PROFILING_ALLOCATION_SAMPLING_DISTANCE=1
125-
export DD_PROFILING_WALL_TIME_ENABLED=yes
126-
export DD_PROFILING_EXPERIMENTAL_CPU_TIME_ENABLED=no
127-
export DD_PROFILING_ENDPOINT_COLLECTION_ENABLED=no
128-
export EXECUTION_TIME=5
129-
php -d extension=$PWD/target/profiler-release/libdatadog_php_profiling.so profiling/tests/correctness/allocation_time_combined.php
130-
unset DD_PROFILING_ALLOCATION_ENABLED DD_PROFILING_ALLOCATION_SAMPLING_DISTANCE DD_PROFILING_WALL_TIME_ENABLED DD_PROFILING_EXPERIMENTAL_CPU_TIME_ENABLED DD_PROFILING_ENDPOINT_COLLECTION_ENABLED EXECUTION_TIME
131-
132113
- name: Run ZTS tests
133114
if: matrix.phpts == 'zts'
134115
run: |

0 commit comments

Comments
 (0)