Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Arthanareeswaran2017-04-20 14:22:19 +0000
committerJay Arthanareeswaran2018-02-14 08:44:47 +0000
commit188fa56efe8177767cc56dcd855b230ba7fb1280 (patch)
tree582727e635772b9926154af1d9b8a589bf5718a5 /org.eclipse.jdt.core.tests.builder
parent1e07a149262601f724e34444775f518eaaad79c5 (diff)
downloadeclipse.jdt.core-188fa56efe8177767cc56dcd855b230ba7fb1280.tar.gz
eclipse.jdt.core-188fa56efe8177767cc56dcd855b230ba7fb1280.tar.xz
eclipse.jdt.core-188fa56efe8177767cc56dcd855b230ba7fb1280.zip
Bug 490103 - Fix test issues
Change-Id: I21a0946de106da74bde0c73472eaf21d5fad6b64 Signed-off-by: Jay Arthanareeswaran <jarthana@in.ibm.com>
Diffstat (limited to 'org.eclipse.jdt.core.tests.builder')
-rw-r--r--org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java b/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java
index 5df235e95f..c2ccd230ec 100644
--- a/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java
+++ b/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -298,7 +298,11 @@ public void addClassFolder(IPath projectPath, IPath classFolderPath, boolean isE
for (int i = 0, max = jars.length; i < max; i++) {
String jar = jars[i];
if (JavaModelManager.isJrtInstallation(jar) || jar.endsWith("jrt-fs.jar")) {
- addEntry(projectPath, JavaCore.newJrtEntry(new Path(jar), null, null, null, null, isExported));
+ IPath path = new Path(jar);
+ if (jar.endsWith("jrt-fs.jar")) {
+ path = path.removeLastSegments(2);
+ }
+ addEntry(projectPath, JavaCore.newJrtEntry(path, null, null, null, null, isExported));
} else {
addEntry(projectPath, JavaCore.newLibraryEntry(new Path(jar), null, null, isExported));
}

Back to the top