fix for 95516 (-outxml / -outxmlfile) - from Matthew.

2 files changed, 23 insertions, 0 deletions

diff --git a/testing/newsrc/org/aspectj/testing/CompileSpec.java b/testing/newsrc/org/aspectj/testing/CompileSpec.java
index 1b50387b0..6b98a6822 100644
--- a/testing/newsrc/org/aspectj/testing/CompileSpec.java
+++ b/testing/newsrc/org/aspectj/testing/CompileSpec.java
@@ -37,6 +37,7 @@ public class CompileSpec implements ITestStep {
 	private String inpath;
 	private String sourceroots;
 	private String outjar;
+	private String outxml;
 	private String xlintfile;
 	private String options;
 	private String baseDir;
@@ -166,6 +167,20 @@ public class CompileSpec implements ITestStep {
 	public void setOutjar(String outjar) {
 		this.outjar = outjar;
 	}
+
+	/**
+	 * @return Returns the outxml.
+	 */
+	public String getOutxmlfile() {
+		return outxml;
+	}
+
+	/**
+	 * @param outxml The the of the aop.xml file to generate
+	 */
+	public void setOutxmlfile(String outxml) {
+		this.outxml = outxml;
+	}
 	/**
 	 * @return Returns the sourceroots.
 	 */
@@ -212,6 +227,11 @@ public class CompileSpec implements ITestStep {
 			args.append(getOutjar());
 			args.append(" ");
 		}
+		if (getOutxmlfile() != null) {
+			args.append("-outxmlfile ");
+			args.append(getOutxmlfile());
+			args.append(" ");
+		}
 		if (getOptions() != null) {
 			StringTokenizer strTok = new StringTokenizer(getOptions(),",");
 			while (strTok.hasMoreTokens()) {
diff --git a/testing/newsrc/org/aspectj/testing/RunSpec.java b/testing/newsrc/org/aspectj/testing/RunSpec.java
index 0716b8362..891600dbf 100644
--- a/testing/newsrc/org/aspectj/testing/RunSpec.java
+++ b/testing/newsrc/org/aspectj/testing/RunSpec.java
@@ -130,6 +130,9 @@ public class RunSpec implements ITestStep {
 		boolean useLtw = false;
 		
 		if (ltwFile != null) {
+            // TODO maw use flag rather than empty file name
+			if (ltwFile.trim().length() == 0) return true;
+			
 			File from = new File(baseDir,ltwFile);
 			File to = new File(sandboxDirectory,"META-INF" + File.separator + "aop.xml");
 //			System.out.println("RunSpec.copyLtwFile() from=" + from.getAbsolutePath() + " to=" + to.getAbsolutePath());