diff options
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/src/org/aspectj/testing/harness/bridge/AjcTest.java | 8 | ||||
| -rw-r--r-- | testing/src/org/aspectj/testing/harness/bridge/JavaRun.java | 9 |
2 files changed, 7 insertions, 10 deletions
diff --git a/testing/src/org/aspectj/testing/harness/bridge/AjcTest.java b/testing/src/org/aspectj/testing/harness/bridge/AjcTest.java index 95fe203dc..7e9f17636 100644 --- a/testing/src/org/aspectj/testing/harness/bridge/AjcTest.java +++ b/testing/src/org/aspectj/testing/harness/bridge/AjcTest.java @@ -85,12 +85,12 @@ public class AjcTest extends RunSpecIterator { /** * do description as title, do sourceLocation, * do keywords, do options, skip paths, do comment, - * skip staging, + * skip staging, skip badInput, * skip dirChanges, do messages and do children * (though we do children directly). */ private static final XMLNames NAMES = new XMLNames(XMLNames.DEFAULT, - "title", null, null, null, "", null, "", true, false, false); + "title", null, null, null, "", null, "", "", true, false, false); private static final String OPTION_PREFIX = "-ajctest"; private static final String[] VALID_OPTIONS = new String[] { OPTION_PREFIX }; @@ -315,12 +315,12 @@ public class AjcTest extends RunSpecIterator { /** * do description, do sourceLocation, * do keywords, do options, skip paths, do comment, - * skip staging, + * skip staging, skip badInput, * skip dirChanges, skip messages and do children * (though we do children directly). */ private static final XMLNames NAMES = new XMLNames(XMLNames.DEFAULT, - null, null, null, null, "", null, "", true, true, false); + null, null, null, null, "", null, "", "", true, true, false); File suiteDir; public Spec() { super(XMLNAME, false); // do not skip this even if children skip diff --git a/testing/src/org/aspectj/testing/harness/bridge/JavaRun.java b/testing/src/org/aspectj/testing/harness/bridge/JavaRun.java index 350550f1d..a636945d6 100644 --- a/testing/src/org/aspectj/testing/harness/bridge/JavaRun.java +++ b/testing/src/org/aspectj/testing/harness/bridge/JavaRun.java @@ -369,11 +369,11 @@ public class JavaRun implements IAjcRun { /** * skip description, skip sourceLocation, * do keywords, do options, skip paths, do comment, - * skip staging, + * skip staging, skip badInput, * do dirChanges, do messages but skip children. */ private static final XMLNames NAMES = new XMLNames(XMLNames.DEFAULT, - "", "", null, null, "", null, "", false, false, true); + "", "", null, null, "", null, "", "", false, false, true); /** fully-qualified name of the class to run */ protected String className; @@ -447,10 +447,7 @@ public class JavaRun implements IAjcRun { if (!LangUtil.isEmpty(dirChanges)) { DirChanges.Spec.writeXml(out, dirChanges); } - List messages = getMessages(); - if (0 < messages.size()) { - SoftMessage.writeXml(out, messages); - } + SoftMessage.writeXml(out, getMessages()); out.endElement(xmlElementName); } public String toLongString() { |