From f685fc12e56e02fa753b4035e5bb2d9365e03828 Mon Sep 17 00:00:00 2001 From: Anna Babu Palathingal <148897727+annaibm@users.noreply.github.com> Date: Wed, 12 Jun 2024 10:32:04 -0400 Subject: [PATCH] Store SharedClasses classes jars in jdkversion dir - Add the classes jars for SharedClassesTest data into specific jdk version dir. - Updated copyright to 2016, 2024. related:eclipse-openj9/openj9#19582 Signed-off-by: Anna Babu Palathingal --- .../src/test.sharedClasses/net/openj9/stf/SharedClasses.java | 5 +++-- 1 file changed, 3 insertions(+), 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 index 81e8140..50c960b 100644 --- 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 prereqRoots = test.env().getPrereqRoots(); int found = 0; for (int i = 0 ; (i < prereqRoots.size()) && ( found == 0 ); i++ ) {