Skip to content

Commit cc1f1aa

Browse files
authored
Exclude ContendedWallclockSamplesTest on graal/aarch64 (#256)
* Exclude ContendedWallclockSamplesTest on graal/aarch64 * Jaroslav's comments
1 parent 6ac5c92 commit cc1f1aa

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

ddprof-lib/src/main/java/com/datadoghq/profiler/Platform.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,11 @@ public static boolean isZing() {
309309
return System.getProperty("java.vm.name").contains("Zing");
310310
}
311311

312+
public static boolean isGraal() {
313+
String vendor = System.getProperty("java.vendor.version");
314+
return vendor != null && vendor.contains(" GraalVM ");
315+
}
316+
312317
public static String getLangVersion() {
313318
return String.valueOf(JAVA_VERSION.major);
314319
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,11 @@ public void after() {
5252
@ValueSource(strings = {"vm", "vmx", "fp", "dwarf"})
5353
public void test(@CStack String cstack) {
5454
// Skip test entirely on unsupported JVMs (don't use assumeFalse which gets retried)
55-
if (Platform.isZing() || Platform.isJ9()) {
55+
if (Platform.isZing() || Platform.isJ9() ||
56+
(isInCI() && isAsan() && Platform.isGraal() && Platform.isAarch64() && "vm".equals(cstack))) {
5657
return;
5758
}
59+
5860
// Running vm stackwalker tests on JVMCI (Graal), JDK 24, aarch64 and with a sanitizer is crashing in a weird place
5961
// This looks like the sanitizer instrumentation is breaking the longjump based crash recovery :(
6062
String config = System.getProperty("ddprof_test.config");

0 commit comments

Comments
 (0)