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

Jump to bottom

Add classes.jar for sharedClassesTestData into specific jdk version dir. #156

Merged
merged 1 commit into from
Jun 13, 2024
Merged

Add classes.jar for sharedClassesTestData into specific jdk version dir. #156

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: 3 additions & 2 deletions openj9.test.sharedClasses/src/test.sharedClasses/net/openj9/stf/SharedClasses.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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();
LongyuZhang marked this conversation as resolved.
Show resolved Hide resolved
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++ ) {
Expand Down