Bug 153907 "Facilitate LTW testing in a custom ClassLoader hierarchy" (fix build break and improve diagnostics)

1 files changed, 11 insertions, 1 deletions

diff --git a/testing/newsrc/org/aspectj/testing/AntSpec.java b/testing/newsrc/org/aspectj/testing/AntSpec.java
index 8ea86cdb5..da83578fa 100644
--- a/testing/newsrc/org/aspectj/testing/AntSpec.java
+++ b/testing/newsrc/org/aspectj/testing/AntSpec.java
@@ -73,6 +73,7 @@ public class AntSpec implements ITestStep {
         Project p = new Project();
         final StringBuffer stdout = new StringBuffer();
         final StringBuffer stderr = new StringBuffer();
+        final StringBuffer verboseLog = new StringBuffer();
         try {
             // read the Ant file
             p.init();
@@ -101,7 +102,13 @@ public class AntSpec implements ITestStep {
                 public void buildFinished(BuildEvent event) {
                     super.buildFinished(event);
                     if (event.getException() != null) {
-                        AjcTestCase.fail(failMessage + "failure " + event.getException());
+                    	StringBuffer message = new StringBuffer();
+                    	message.append(event.getException().toString()).append("\n");
+                    	message.append(verboseLog);
+                    	message.append(stdout);
+                    	message.append(stderr);
+//                        AjcTestCase.fail(failMessage + "failure " + event.getException());
+                        AjcTestCase.fail(message.toString());
                     }
                 }
                 public void targetFinished(BuildEvent event) {
@@ -122,6 +129,9 @@ public class AntSpec implements ITestStep {
                     	case Project.MSG_WARN:
                     		stderr.append(event.getMessage()).append('\n');
                         	break;
+                    	case Project.MSG_VERBOSE:
+                    		verboseLog.append(event.getMessage()).append('\n');
+                        	break;
                     }
                 }
             };