PR-based queries were dominating - now do union correctly

diff --git a/testing/src/org/aspectj/testing/harness/bridge/AjcTest.java b/testing/src/org/aspectj/testing/harness/bridge/AjcTest.java
index 55ec35258181b118893ced2b21a33bb2d3c23a01..e67eb8b9e1920267977a1cf5055b69877a394ca9 100644 (file)
--- a/testing/src/org/aspectj/testing/harness/bridge/AjcTest.java
+++ b/testing/src/org/aspectj/testing/harness/bridge/AjcTest.java
@@ -343,6 +343,7 @@ public class AjcTest extends RunSpecIterator {
          * <li>the spec does not have a required title (description)n</li>
          * </ul>
          * When skipping, this issues a messages as to why skipped.
+         * Skip combinations are not guaranteed to work correctly. XXX
          * @return false if this wants to be skipped, true otherwise
          * @throws Error if selected option is not of the form
          *          <pre>-ajctest[Require|Skip]Keywords=keyword{,keyword}..</pre>.
@@ -425,7 +426,7 @@ public class AjcTest extends RunSpecIterator {
                         String spec = (String) iter.next();
                         if (null != havePr) {
                             if (havePr.equals(spec)) { // String.equals()
-                                return true;
+                                havePr = null;
                             }
                         } else if (keywordMustExist != keywords.contains(spec)) {
                             String reason = "keyword " + spec