diff --git a/openj9.test.sharedClasses.jvmti/build.xml b/openj9.test.sharedClasses.jvmti/build.xml index 278b435..61758a2 100644 --- a/openj9.test.sharedClasses.jvmti/build.xml +++ b/openj9.test.sharedClasses.jvmti/build.xml @@ -71,13 +71,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex - - - diff --git a/openj9.test.sharedClasses.jvmti/src/test.sharedClasses.jvmti/net/openj9/stf/SharedClassesAPI.java b/openj9.test.sharedClasses.jvmti/src/test.sharedClasses.jvmti/net/openj9/stf/SharedClassesAPI.java index 7b78b32..a210fec 100644 --- a/openj9.test.sharedClasses.jvmti/src/test.sharedClasses.jvmti/net/openj9/stf/SharedClassesAPI.java +++ b/openj9.test.sharedClasses.jvmti/src/test.sharedClasses.jvmti/net/openj9/stf/SharedClassesAPI.java @@ -209,28 +209,24 @@ public void execute(StfCoreExtension test, StfSharedClassesExtension sharedClass .addProjectToClasspath("openj9.test.sharedClasses.jvmti") .runClass(SharedClassesCacheChecker.class)); } else { - // Temporarily excluding the native tests from running on Windows - // due to: https://github.com/eclipse-openj9/openj9-systemtest/issues/38 - if ( !PlatformFinder.isWindows() ) { - // Verify caches using a JVMTI native agent - String nativeExt = PlatformFinder.isWindows() ? ".dll" : ".so"; - String nativePrefix = PlatformFinder.isWindows() ? "" : "lib"; - FileRef agent = test.env().findTestDirectory("openj9.test.sharedClasses.jvmti/bin/native") - .childDirectory(test.env().getPlatformSimple()) - .childFile(nativePrefix + "sharedClasses" + nativeExt); - - if (!cacheDir.isEmpty()) { - cacheDir = "," + cacheDir; - } - String agentOptions = "expectedCacheCount=" + apiTest.expectedCacheCount + "," - + "deleteCaches=true," - + "cachePrefix=" + apiTest.name() + cacheDir; - - sharedClasses.doVerifyCachesUsingJVMTI(commentPrefix + "Verify caches using JVMTI", - apiTest.name(), - sharedClassesOption, - "-agentpath:" + agent + "=" + agentOptions); + // Verify caches using a JVMTI native agent + String nativeExt = PlatformFinder.isWindows() ? ".dll" : ".so"; + String nativePrefix = PlatformFinder.isWindows() ? "" : "lib"; + FileRef agent = test.env().findTestDirectory("openj9.test.sharedClasses.jvmti/bin/native") + .childDirectory(test.env().getPlatformSimple()) + .childFile(nativePrefix + "sharedClasses" + nativeExt); + + if (!cacheDir.isEmpty()) { + cacheDir = "," + cacheDir; } + String agentOptions = "expectedCacheCount=" + apiTest.expectedCacheCount + "," + + "deleteCaches=true," + + "cachePrefix=" + apiTest.name() + cacheDir; + + sharedClasses.doVerifyCachesUsingJVMTI(commentPrefix + "Verify caches using JVMTI", + apiTest.name(), + sharedClassesOption, + "-agentpath:" + agent + "=" + agentOptions); } } }