Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Temporarily exclude native sharedClasses tests on Windows" #160

Merged
merged 1 commit into from
Oct 2, 2024
Merged

Revert "Temporarily exclude native sharedClasses tests on Windows" #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions openj9.test.sharedClasses.jvmti/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
<target name="build-no-natives" depends="check-prereqs, build-dependencies, check-prereqs, build-archives">
</target>

<!--Temporarily excluding the native tests from building on Windows
due to : https://github.com/eclipse-openj9/openj9-systemtest/issues/38 -->
<target name="build-natives" depends="check-prereqs, setup-native-build-command, build-natives-windows, build-natives-unix">
</target>

<!-- <target name="build-natives" depends="check-prereqs, setup-native-build-command, build-natives-unix">
</target> -->

<target name="setup-native-build-command">
<echo message="building natives for java-platform ${java_platform}"/>
Expand Down
38 changes: 17 additions & 21 deletions ...est.sharedClasses.jvmti/src/test.sharedClasses.jvmti/net/openj9/stf/SharedClassesAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down