From 66cfe413b00ddae2cda1567ba296576f98d02301 Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Mon, 13 Feb 2012 16:57:06 +0400 Subject: [PATCH] fix tests: paths containing non-existing dirs cannot be resolved under linux --- .../compiler/server/impl/CompileServerClasspathManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/server/impl/CompileServerClasspathManager.java b/java/compiler/impl/src/com/intellij/compiler/server/impl/CompileServerClasspathManager.java index f1bd0abfc030..32cfe65d6cd4 100644 --- a/java/compiler/impl/src/com/intellij/compiler/server/impl/CompileServerClasspathManager.java +++ b/java/compiler/impl/src/com/intellij/compiler/server/impl/CompileServerClasspathManager.java @@ -53,7 +53,10 @@ public class CompileServerClasspathManager { } else if (baseFile.isDirectory()) { final String relativePath = serverPlugin.getJarPath(); - File jarFile = new File(new File(baseFile, "lib"), relativePath); + + final File jarFile = relativePath.startsWith("../") + ? new File(baseFile, relativePath.substring(3)) + : new File(new File(baseFile, "lib"), relativePath); if (jarFile.exists()) { classpath.add(jarFile); }