From 2c3ac2ed7b537ee1212fe6be7fa3a821a5243225 Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko Date: Fri, 5 Jul 2024 17:01:01 +0200 Subject: [PATCH] Ignore JVM patching for IBM 8 --- .../instrumentation/store/CoreJvmClassReaderTest.groovy | 5 +++++ .../coverage/instrumentation/store/JvmPatcherTest.groovy | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/coverage/instrumentation/store/CoreJvmClassReaderTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/coverage/instrumentation/store/CoreJvmClassReaderTest.groovy index f209a113db6..8399acfc430 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/coverage/instrumentation/store/CoreJvmClassReaderTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/coverage/instrumentation/store/CoreJvmClassReaderTest.groovy @@ -1,9 +1,14 @@ package datadog.trace.civisibility.coverage.instrumentation.store +import datadog.trace.api.Platform import datadog.trace.civisibility.config.JvmInfo import org.apache.commons.io.IOUtils +import spock.lang.IgnoreIf import spock.lang.Specification +@IgnoreIf(reason = "IBM Java 8 dist has a different structure, the thread class does not live in rt.jar", value = { + Platform.isIbm8() +}) class CoreJvmClassReaderTest extends Specification { def "test reads Thread class"() { diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/coverage/instrumentation/store/JvmPatcherTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/coverage/instrumentation/store/JvmPatcherTest.groovy index 7bb8a57054c..3c013b0dd3f 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/coverage/instrumentation/store/JvmPatcherTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/coverage/instrumentation/store/JvmPatcherTest.groovy @@ -1,11 +1,16 @@ package datadog.trace.civisibility.coverage.instrumentation.store +import datadog.trace.api.Platform import datadog.trace.civisibility.config.JvmInfo import datadog.trace.civisibility.utils.FileUtils +import spock.lang.IgnoreIf import spock.lang.Specification import java.nio.file.Files +@IgnoreIf(reason = "IBM Java 8 dist has a different structure, the thread class does not live in rt.jar", value = { + Platform.isIbm8() +}) class JvmPatcherTest extends Specification { def "test patches current JVM"() {