Skip to content

Commit

Permalink
Merge pull request #156 from annaibm/system_test_jdkdir
Browse files Browse the repository at this point in the history
Add classes.jar for sharedClassesTestData into specific jdk version dir.
  • Loading branch information
pshipton authored Jun 13, 2024
2 parents 0cc1cdb + f685fc1 commit ce686f5
Showing 1 changed file with 3 additions and 2 deletions.
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();
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

0 comments on commit ce686f5

Please sign in to comment.