Skip to content

Commit

Permalink
Generate classes_jdk.jar instead of classes.jar
Browse files Browse the repository at this point in the history
- Include Java version number as in  classes_jdk8.jar while generating the classes.jar file.

closes: eclipse-openj9/openj9#19582

Signed-off-by: Anna Babu Palathingal <anna.bp@ibm.com>
  • Loading branch information
annaibm committed Jun 11, 2024
1 parent 0cc1cdb commit e6065ad
Show file tree
Hide file tree
Showing 2 changed files with 137 additions and 102 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -186,16 +186,20 @@ public void setUp(StfCoreExtension test, StfSharedClassesExtension sharedClasses
// See whether the test data (20000 classes and jars) already exist.
// If not, create them in the first -systemtest-prereqs directory (or the default location if no -systemtest-prereqs were supplied).
DirectoryRef sharedClassesDataDir = null; // This will be initialised when we find it.
int javaVersion = test.env().primaryJvm().getJavaVersion();
String dataSubdir = "sharedClassesTestData/v1";
ArrayList<DirectoryRef> prereqRoots = test.env().getPrereqRoots();
String classFileName = "classes_jdk" + javaVersion + ".jar";
FileRef sharedClassesJar = null;
int found = 0;
for (int i = 0 ; (i < prereqRoots.size()) && ( found == 0 ); i++ ) {
sharedClassesDataDir = prereqRoots.get(i).childDirectory(dataSubdir);
if (!sharedClassesDataDir.exists()) {
System.out.println(sharedClassesDataDir.getSpec() + " does not exist");
sharedClassesJar = sharedClassesDataDir.childFile(classFileName);
if (!sharedClassesJar.exists()) {
System.out.println(sharedClassesJar.getSpec() + " does not exist");
}
else {
System.out.println(sharedClassesDataDir.getSpec() + " exists");
System.out.println(sharedClassesJar.getSpec() + " exists");
found = 1;
}
}
Expand All @@ -211,7 +215,8 @@ public void setUp(StfCoreExtension test, StfSharedClassesExtension sharedClasses
.addProjectToClasspath("openj9.test.sharedClasses")
.runClass(JavaGen.class)
.addArg(sharedClassesDataDir.getSpec())
.addArg("10000"));
.addArg("10000")
.addArg(String.valueOf(javaVersion)));
}

// Copy the shared classes jar/s from the systemtest_prereqs directory to /tmp.
Expand All @@ -221,7 +226,7 @@ public void setUp(StfCoreExtension test, StfSharedClassesExtension sharedClasses
DirectoryRef localSharedClassesJarsDir = test.doCpDir("Copy sharedClasses jars", appsSharedClassesJarsDir, test.env().getTmpDir().childDirectory("jars"));
localSharedClassesResources = localSharedClassesJarsDir.getSpec();
} else {
FileRef sharedClassesJar = sharedClassesDataDir.childFile("classes.jar");
sharedClassesJar = sharedClassesDataDir.childFile(classFileName);
FileRef localSharedClassesJar = test.doCp("Copy sharedClasses jar", sharedClassesJar, test.env().getTmpDir());
localSharedClassesResources = localSharedClassesJar.getSpec();
}
Expand Down
Loading

0 comments on commit e6065ad

Please sign in to comment.