Merge pull request #156 from annaibm/system_test_jdkdir

Add classes.jar for sharedClassesTestData into specific jdk version dir.
adoptium · Jun 13, 2024 · ce686f5 · ce686f5
2 parents 0cc1cdb + f685fc1
commit ce686f5
Showing 1 changed file with 3 additions and 2 deletions.
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
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2016, 2023 IBM Corp. and others
+* Copyright (c) 2016, 2024 IBM Corp. and others
 *
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License 2.0 which accompanies this distribution
@@ -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++ ) {