was missing two jars - I've added them.

1 files changed, 28 insertions, 0 deletions

diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java
index 5d3666169..e7a30d581 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java
@@ -21,6 +21,8 @@ import org.aspectj.tools.ajc.AjcTests;
 
 public class BcweaverJarMaker {
 
+	private static String cp = "../lib/test/aspectjrt.jar;../lib/test/testing-client.jar" + File.pathSeparator + System.getProperty("aspectjrt.path");
+	
 	public BcweaverJarMaker() {
 		super();
 	}
@@ -42,6 +44,8 @@ public class BcweaverJarMaker {
 		makeDuplicateManifestTestJars();
 
 		makeOutjarTestJars();
+		makeAspectPathTestJars();
+		makeAjc11TestJars();
 	}
 	
 	public static void makeJar0() throws IOException {
@@ -354,6 +358,30 @@ public class BcweaverJarMaker {
 		CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
 	}	
 	
+	public static void makeAspectPathTestJars() throws IOException {
+		List args = new ArrayList();
+
+		args.clear();
+		args.add("-classpath"); 
+		args.add(cp);
+		args.add("-outjar");
+		args.add("../tests/bugs/perCflowAndJar/lib.jar");
+		args.add("../tests/bugs/perCflowAndJar/PerCFlowCompileFromJar.java");
+		CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
+	}
+	
+	public static void makeAjc11TestJars() throws IOException {
+		List args = new ArrayList();
+
+		args.clear();
+		args.add("-classpath"); 
+		args.add(cp);
+		args.add("-outjar");
+		args.add("../tests/bugs/cflowAndJar/lib.jar");
+		args.add("../tests/bugs/cflowAndJar/AbstractAspect.aj");
+		CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
+	}
+	
 	public static void makeOutjarTestJars() throws IOException {
 		List args = new ArrayList();