attempt to create the right classpath for running org.aspectj.weaver.tools tests on the build machine...

testing/newsrc/org/aspectj/testing/RunSpec.java

@@ -11,6 +11,7 @@
  * ******************************************************************/
 package org.aspectj.testing;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
@@ -29,6 +30,7 @@ public class RunSpec implements ITestStep {
 	private String classToRun;
 	private String baseDir;
 	private String options;
+	private String cpath;
 	private AjcTest myTest;
 	private OutputSpec stdErrSpec;
 	private OutputSpec stdOutSpec;
@@ -44,7 +46,7 @@ public class RunSpec implements ITestStep {
 			System.err.println("Warning, message spec for run command is currently ignored (org.aspectj.testing.RunSpec)");
 		}
 		String[] args = buildArgs();
-		AjcTestCase.RunResult rr = inTestCase.run(getClassToRun(),args,null);
+		AjcTestCase.RunResult rr = inTestCase.run(getClassToRun(),args,getClasspath());
 		if (stdErrSpec != null) {
 			stdErrSpec.matchAgainst(rr.getStdErr());
 		}
@@ -73,6 +75,14 @@ public class RunSpec implements ITestStep {
 		this.options = options;
 	}
 	
+	public String getClasspath() {
+		return this.cpath.replace('/', File.separatorChar);
+	}
+ 	
+	public void setClasspath(String cpath) {
+		this.cpath = cpath;
+	}
+	
 	public void addStdErrSpec(OutputSpec spec) {
 		this.stdErrSpec = spec;
 	}

tests/src/org/aspectj/systemtest/ajc150/ataspectj/annotationgen.xml

@@ -146,7 +146,7 @@
    <ajc-test dir="java5/ataspectj/annotationGen" title="runtime pointcut resolution referencing compiled pointcuts">
         <compile files="PCLib.aj,RuntimePointcuts.java" options="-1.5">
         </compile>
-        <run class="RuntimePointcuts"/>
+        <run class="RuntimePointcuts" classpath="../lib/bcel/bcel.jar"/>
     </ajc-test>          
     
 </suite>