Store SharedClasses classes jars in jdkversion dir

- Add the classes jars for SharedClassesTest data into specific jdk version dir. related:eclipse-openj9/openj9#19582 Signed-off-by: Anna Babu Palathingal <[email protected]>
annaibm · Jun 12, 2024 · 6255b9a · 6255b9a
1 parent 0cc1cdb
commit 6255b9a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/openj9.test.sharedClasses/src/test.sharedClasses/net/openj9/stf/SharedClasses.java b/openj9.test.sharedClasses/src/test.sharedClasses/net/openj9/stf/SharedClasses.java
@@ -186,7 +186,8 @@ 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.
-		String dataSubdir = "sharedClassesTestData/v1";
+		int javaVersion = test.env().primaryJvm().getJavaVersion();
+		String dataSubdir = "sharedClassesTestData/v1/jdk" + javaVersion;
 		ArrayList<DirectoryRef> prereqRoots = test.env().getPrereqRoots();
 		int found = 0;
 		for (int i = 0 ; (i < prereqRoots.size()) && ( found == 0 ); i++ ) {