From 5863f69f2b4ad9c51447f99db989f3c73684066f Mon Sep 17 00:00:00 2001 From: Zhengyu Gu Date: Tue, 12 Aug 2025 10:17:24 -0400 Subject: [PATCH 1/2] ContendedWallclockSamplesTest also crashes with cstack=vmx + graal + aarch64 --- .../profiler/wallclock/ContendedWallclockSamplesTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ddprof-test/src/test/java/com/datadoghq/profiler/wallclock/ContendedWallclockSamplesTest.java b/ddprof-test/src/test/java/com/datadoghq/profiler/wallclock/ContendedWallclockSamplesTest.java index 44b7e3628..a3c455b21 100644 --- a/ddprof-test/src/test/java/com/datadoghq/profiler/wallclock/ContendedWallclockSamplesTest.java +++ b/ddprof-test/src/test/java/com/datadoghq/profiler/wallclock/ContendedWallclockSamplesTest.java @@ -53,7 +53,8 @@ public void after() { public void test(@CStack String cstack) { // Skip test entirely on unsupported JVMs (don't use assumeFalse which gets retried) if (Platform.isZing() || Platform.isJ9() || - (isInCI() && isAsan() && Platform.isGraal() && Platform.isAarch64() && "vm".equals(cstack))) { + (isInCI() && isAsan() && Platform.isGraal() && Platform.isAarch64() && + ("vm".equals(cstack) || "vmx".equals(cstack)))) { return; } From f4903597e939a725f92939258473c4ba099679d6 Mon Sep 17 00:00:00 2001 From: Zhengyu Gu Date: Tue, 12 Aug 2025 10:26:49 -0400 Subject: [PATCH 2/2] Cleanup --- .../profiler/wallclock/ContendedWallclockSamplesTest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/ddprof-test/src/test/java/com/datadoghq/profiler/wallclock/ContendedWallclockSamplesTest.java b/ddprof-test/src/test/java/com/datadoghq/profiler/wallclock/ContendedWallclockSamplesTest.java index a3c455b21..bf8591ca6 100644 --- a/ddprof-test/src/test/java/com/datadoghq/profiler/wallclock/ContendedWallclockSamplesTest.java +++ b/ddprof-test/src/test/java/com/datadoghq/profiler/wallclock/ContendedWallclockSamplesTest.java @@ -5,7 +5,6 @@ import com.datadoghq.profiler.context.ContextExecutor; import com.datadoghq.profiler.junit.CStack; import com.datadoghq.profiler.junit.RetryTest; -import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.params.provider.ValueSource; import org.openjdk.jmc.common.item.IItem; @@ -21,8 +20,6 @@ import java.util.concurrent.atomic.AtomicLong; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assumptions.assumeFalse; -import static org.junit.jupiter.api.Assumptions.assumeTrue; public class ContendedWallclockSamplesTest extends CStackAwareAbstractProfilerTest {