Skip to content

Commit 958a531

Browse files
authored
ContendedWallclockSamplesTest also fails intermittently when cstack=vmx with graal/aarch64 (#258)
* ContendedWallclockSamplesTest also crashes with cstack=vmx + graal + aarch64 * Cleanup
1 parent cc1f1aa commit 958a531

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

ddprof-test/src/test/java/com/datadoghq/profiler/wallclock/ContendedWallclockSamplesTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.datadoghq.profiler.context.ContextExecutor;
66
import com.datadoghq.profiler.junit.CStack;
77
import com.datadoghq.profiler.junit.RetryTest;
8-
import org.junit.jupiter.api.Assumptions;
98
import org.junit.jupiter.api.TestTemplate;
109
import org.junit.jupiter.params.provider.ValueSource;
1110
import org.openjdk.jmc.common.item.IItem;
@@ -21,8 +20,6 @@
2120
import java.util.concurrent.atomic.AtomicLong;
2221

2322
import static org.junit.jupiter.api.Assertions.assertTrue;
24-
import static org.junit.jupiter.api.Assumptions.assumeFalse;
25-
import static org.junit.jupiter.api.Assumptions.assumeTrue;
2623

2724

2825
public class ContendedWallclockSamplesTest extends CStackAwareAbstractProfilerTest {
@@ -53,7 +50,8 @@ public void after() {
5350
public void test(@CStack String cstack) {
5451
// Skip test entirely on unsupported JVMs (don't use assumeFalse which gets retried)
5552
if (Platform.isZing() || Platform.isJ9() ||
56-
(isInCI() && isAsan() && Platform.isGraal() && Platform.isAarch64() && "vm".equals(cstack))) {
53+
(isInCI() && isAsan() && Platform.isGraal() && Platform.isAarch64() &&
54+
("vm".equals(cstack) || "vmx".equals(cstack)))) {
5755
return;
5856
}
5957

0 commit comments

Comments
 (0)