diff options
| author | Andy Clement <aclement@pivotal.io> | 2017-09-24 22:00:25 -0700 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2017-09-24 22:00:25 -0700 |
| commit | ab8339852515f04236d41b9af486ea9f0c50c6c7 (patch) | |
| tree | ec08d02f6cfa6d4a81fef919a750cb19aa3f4ca4 /ajde | |
| parent | ad514d54b1014bbfa085096419080c9fc6e1642b (diff) | |
| download | aspectj-ab8339852515f04236d41b9af486ea9f0c50c6c7.tar.gz aspectj-ab8339852515f04236d41b9af486ea9f0c50c6c7.zip | |
Various changes to get tests passing on 1.8 and 1.9
Diffstat (limited to 'ajde')
| -rw-r--r-- | ajde/testsrc/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java | 7 |
1 files changed, 6 insertions, 1 deletions
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() { |