From ab8339852515f04236d41b9af486ea9f0c50c6c7 Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Sun, 24 Sep 2017 22:00:25 -0700 Subject: Various changes to get tests passing on 1.8 and 1.9 --- .../org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'ajde') diff --git a/ajde/testsrc/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java b/ajde/testsrc/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java index 2e5520a45..32f12c82d 100644 --- a/ajde/testsrc/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java +++ b/ajde/testsrc/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java @@ -25,6 +25,7 @@ import org.aspectj.ajde.core.IOutputLocationManager; import org.aspectj.ajde.core.JavaOptions; import org.aspectj.tools.ajc.AjcTests; import org.aspectj.util.FileUtil; +import org.aspectj.util.LangUtil; /** * Test implementation of ICompilerConfiguration. Allows users to configure the settings via setter methods. By default returns null @@ -64,8 +65,12 @@ public class TestCompilerConfiguration implements ICompilerConfiguration { } public String getClasspath() { - return projectPath + File.pathSeparator + System.getProperty("sun.boot.class.path") + File.pathSeparator + String cp = projectPath + File.pathSeparator + System.getProperty("sun.boot.class.path") + File.pathSeparator + AjcTests.aspectjrtClasspath(); + if (LangUtil.is19VMOrGreater()) { + cp = LangUtil.getJrtFsFilePath()+File.pathSeparator+cp; + } + return cp; } public Set getInpath() { -- cgit v1.2.3