From e3f82f61e138abca72a726b9e22fa26e67c9b757 Mon Sep 17 00:00:00 2001 From: aclement Date: Thu, 23 Jun 2005 08:42:08 +0000 Subject: [PATCH] Classpath set for running tests on build machine --- .../testsrc/org/aspectj/tools/ajc/Ajc.java | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java index fd5a2f40d..afbd3f0e8 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java +++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java @@ -43,20 +43,26 @@ import org.aspectj.util.FileUtil; public class Ajc { private static final String SANDBOX_NAME = "ajcSandbox"; + private static final String TESTER_PATH = - ".."+File.separator+"testing-client"+File.separator+"bin" + File.pathSeparator + - ".."+File.separator+"runtime"+File.separator+"bin" + File.pathSeparator + - //TODO AV - done, remove comments: can someone tell why those jar needs to be there ?? - // 1/ see the line before: bin/ will take precedence.. - // 2/ see below - aspectj5rt is added last which makes it UNconsistent with the way runtime is handled here.. - //".."+File.separator+"lib"+File.separator+"test"+File.separator+"aspectjrt.jar"+ File.pathSeparator+ - //".."+File.separator+"lib"+File.separator+"test"+File.separator+"testing-client.jar" + File.pathSeparator + - ".."+File.separator+"aspectj5rt"+File.separator+"bin" + File.pathSeparator - + File.pathSeparator+ ".."+File.separator+"lib"+File.separator+"junit"+File.separator+"junit.jar" - + File.pathSeparator+ ".."+File.separator+"bridge"+File.separator+"bin" - + File.pathSeparator+ ".."+File.separator+"loadtime"+File.separator+"bin" + ".."+File.separator+"testing-client"+File.separator+"bin" + + File.pathSeparator+".."+File.separator+"runtime" +File.separator+"bin" + + File.pathSeparator+".."+File.separator+"aspectj5rt"+File.separator+"bin" + + File.pathSeparator+".."+File.separator+"lib" +File.separator+"junit"+File.separator+"junit.jar" + + File.pathSeparator+".."+File.separator+"bridge" +File.separator+"bin" + + File.pathSeparator+".."+File.separator+"loadtime" +File.separator+"bin" + + // When the build machine executes the tests, it is using code built into jars rather than code build into + // bin directories. This means for the necessary types to be found we have to put these jars on the classpath: + + File.pathSeparator+".."+File.separator+"aj-build"+File.separator+"jars"+File.separator+"bridge.jar" + + File.pathSeparator+".."+File.separator+"aj-build"+File.separator+"jars"+File.separator+"util.jar" + + File.pathSeparator+".."+File.separator+"lib" +File.separator+"test"+File.separator+"testing-client.jar" + // hmmm, this next one should perhaps point to an aj-build jar... + + File.pathSeparator+".."+File.separator+"lib" +File.separator+"test"+File.separator+"aspectjrt.jar" ; + + private CompilationResult result; private File sandbox; private File baseDir; -- 2.39.5