From 870577699de0f11a2ac0a6c65729b36207b50357 Mon Sep 17 00:00:00 2001 From: aclement Date: Mon, 26 Sep 2005 08:46:07 +0000 Subject: Ensure tests run if no aj-build folder exists. --- org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java | 3 ++- org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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 a6c744fa0..da724ca5a 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 @@ -51,6 +51,7 @@ public class Ajc { + 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.pathSeparator+".."+File.separator+"weaver" +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: @@ -74,7 +75,7 @@ public class Ajc { private int incrementalStage = 10; private boolean shouldEmptySandbox = true; private AjcCommandController controller; - private static boolean verbose = (!System.getProperty("org.aspectj.tools.ajc.Ajc.verbose","false").equals("false")); + private static boolean verbose = true; //(!System.getProperty("org.aspectj.tools.ajc.Ajc.verbose","false").equals("false")); /** diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java index 0fe6ffc69..6c2a73882 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java +++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java @@ -68,6 +68,7 @@ public class AjcTestCase extends TestCase { File.pathSeparator + ".." + File.separator + "aspectj5rt" + File.separator + "bin" + File.pathSeparator+ ".."+File.separator+"lib"+File.separator+"junit"+File.separator+"junit.jar" + File.pathSeparator+ ".."+File.separator+"loadtime"+File.separator+"bin" + + File.pathSeparator+ ".."+File.separator+"weaver"+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: -- cgit v1.2.3