diff options
Diffstat (limited to 'ajdoc')
| -rw-r--r-- | ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocTestCase.java | 8 | ||||
| -rw-r--r-- | ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocTestCase.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocTestCase.java index 2db299f37..d75f8cb64 100644 --- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocTestCase.java +++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocTestCase.java @@ -19,6 +19,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.aspectj.tools.ajc.Ajc; +import org.aspectj.util.LangUtil; /** * This class is the super class of all Ajdoc tests. It creates a sandbox directory and provides utility methods for copying over @@ -202,7 +203,12 @@ public class AjdocTestCase extends TestCase { args[1] = "-source"; args[2] = sourceLevel; args[3] = "-classpath"; - args[4] = AjdocTests.ASPECTJRT_PATH.getPath(); + StringBuilder classpath = new StringBuilder(); + if (LangUtil.is19VMOrGreater()) { + classpath.append(LangUtil.getJrtFsFilePath()).append(File.pathSeparator); + } + classpath.append(AjdocTests.ASPECTJRT_PATH.getPath()); + args[4] = classpath.toString(); args[5] = "-d"; args[6] = getAbsolutePathOutdir(); // args[7] = "-Xset:minimalModel=false"; diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java index 6ee7f7a88..144b4e478 100644 --- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java +++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java @@ -16,7 +16,6 @@ import java.util.List; import org.aspectj.util.LangUtil; - /** * A long way to go until full coverage, but this is the place to add more. * |