Skip to content

Commit 394a7a0

Browse files
authored
Exclude BoundMethodHandleMetadataSizeTest from running on IBM JDK 8 (#248)
* Exclude BoundMethodHandleMetadataSizeTest from running on IBM JDK 8 * Fix AP commit lock
1 parent fec8a13 commit 394a7a0

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

ddprof-lib/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ def cloneAPTask = tasks.register('cloneAsyncProfiler') {
270270
if (!targetDir.exists()) {
271271
println "Cloning missing async-profiler git subdirectory..."
272272
exec {
273-
commandLine 'git', 'clone', '--branch', branch_lock, '--depth', '1', 'https://github.com/datadog/async-profiler.git', targetDir.absolutePath
273+
commandLine 'git', 'clone', '--branch', branch_lock, 'https://github.com/datadog/async-profiler.git', targetDir.absolutePath
274274
}
275275
exec {
276276
workingDir targetDir.absolutePath

ddprof-test/src/test/java/com/datadoghq/profiler/metadata/BoundMethodHandleMetadataSizeTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ protected String getProfilerCommand() {
2222
@Test
2323
public void test() throws Throwable {
2424
assumeFalse(Platform.isJ9() && isAsan()); // running this test on j9 and asan is weirdly crashy
25+
assumeFalse(Platform.isJ9() && Platform.isJavaVersion(8)); // geting crash-failur in CI reliable; remove once that is fixed
2526
assumeFalse(Platform.isJ9() && Platform.isJavaVersion(17)); // JVMTI::GetClassSignature() is reliably crashing on a valid 'class' instance
2627
assumeFalse(Platform.isAarch64() && Platform.isMusl() && !Platform.isJavaVersionAtLeast(11)); // aarch64 + musl + jdk 8 will crash very often
2728
registerCurrentThreadForWallClockProfiling();

gradle/ap-lock.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
branch=dd/master
2-
commit=b034e4c3141d0632fd60bc452d7532d84adad572
2+
commit=87b7b42ec65be0a00a67e3f9451fb8e4d472b188

0 commit comments

Comments
 (0)