diff options
| author | Alexander Kriegisch <Alexander@Kriegisch.name> | 2022-03-23 12:49:24 +0700 |
|---|---|---|
| committer | Alexander Kriegisch <Alexander@Kriegisch.name> | 2022-03-23 12:49:24 +0700 |
| commit | 2d2110f364609d3002643947fc89a9dc10a7c97b (patch) | |
| tree | 181f386107eaf0976cde7af202c1d1613d806058 /org.aspectj.ajdt.core | |
| parent | 63d5e3e893bd149245465de1610716930998dec8 (diff) | |
| download | aspectj-2d2110f364609d3002643947fc89a9dc10a7c97b.tar.gz aspectj-2d2110f364609d3002643947fc89a9dc10a7c97b.zip | |
Introduce AjcTestCase.DEFAULT_FULL_LTW_CLASSPATH_ENTRIES
In 'useFullLTW' mode, aspectjweaver.jar is a Java agent. Therefore, what
is contained in there does not need to be on the classpath.
Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
Diffstat (limited to 'org.aspectj.ajdt.core')
| -rw-r--r-- | org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java index 10b6d09dd..801318a16 100644 --- a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java @@ -80,14 +80,21 @@ public abstract class AjcTestCase extends TestCase { .findFirst() .orElseThrow(() -> new RuntimeException("JUnit library not found on classpath")); - // see Ajc and AntSpec - public static final String DEFAULT_CLASSPATH_ENTRIES = - Ajc.outputFolders("bridge","util","loadtime","weaver","asm","testing-client","runtime","org.aspectj.matcher") + // In 'useFullLTW' mode, aspectjweaver.jar is a Java agent. Therefore, what is contained in there + // does not need to be on the classpath. + public static final String DEFAULT_FULL_LTW_CLASSPATH_ENTRIES = + Ajc.outputFolders("testing-client") + pathSeparator + CLASSPATH_JUNIT + + pathSeparator + ".." + separator + "lib" + separator + "test" + separator + "testing-client.jar" + ; + + // See Ajc and AntSpec + public static final String DEFAULT_CLASSPATH_ENTRIES = + DEFAULT_FULL_LTW_CLASSPATH_ENTRIES + + Ajc.outputFolders("bridge", "util", "loadtime", "weaver", "asm", "runtime", "org.aspectj.matcher") + pathSeparator + ".." + separator + "lib" + separator + "bcel" + separator + "bcel.jar" + pathSeparator + ".." + separator + "lib" + separator + "bcel" + separator + "bcel-verifier.jar" + pathSeparator + CLASSPATH_ASM - + pathSeparator + ".." + separator + "lib" + separator + "test" + separator + "testing-client.jar" // hmmm, this next one should perhaps point to an aj-build jar... + pathSeparator + ".." + separator + "lib" + separator + "test" + separator + "aspectjrt.jar" ; @@ -631,7 +638,7 @@ public abstract class AjcTestCase extends TestCase { File directory = new File ("."); String absPath = directory.getAbsolutePath(); String javaagent = absPath + separator + ".." + separator + "lib" + separator + "aspectj" + separator + "lib" + separator + "aspectjweaver.jar"; - String defaultCpAbsolute = Arrays.stream(DEFAULT_CLASSPATH_ENTRIES.split(pathSeparator)) + String defaultCpAbsolute = Arrays.stream(DEFAULT_FULL_LTW_CLASSPATH_ENTRIES.split(pathSeparator)) .map(path -> new File(path).getAbsolutePath()) .collect(Collectors.joining(pathSeparator)); try { |