Bug 152982 "org.aspectj Restructure - Phase 2: Move tests" (move MultiProjectIncremen...

diff --git a/tests/src/org/aspectj/systemtest/AllTests.java b/tests/src/org/aspectj/systemtest/AllTests.java
index f22cc1a39f985f7d2ee6da9927baec373534d9cc..2a399b1dcc98103941830aa1c33726e86b73e043 100644 (file)
--- a/tests/src/org/aspectj/systemtest/AllTests.java
+++ b/tests/src/org/aspectj/systemtest/AllTests.java
@@ -18,7 +18,6 @@ import org.aspectj.systemtest.base.BaseTests;
 import org.aspectj.systemtest.design.DesignTests;
 import org.aspectj.systemtest.incremental.IncrementalTests;
 import org.aspectj.systemtest.incremental.model.IncrementalModelTests;
-import org.aspectj.systemtest.incremental.tools.MultiProjectIncrementalTests;
 import org.aspectj.systemtest.incremental.tools.OutputLocationManagerTests;
 import org.aspectj.systemtest.inpath.InPathTests;
 import org.aspectj.systemtest.options.OptionsTests;
@@ -44,7 +43,6 @@ public class AllTests {
                suite.addTest(BaseTests.suite());
                suite.addTest(DesignTests.suite());
                suite.addTest(IncrementalTests.suite());
-               suite.addTestSuite(MultiProjectIncrementalTests.class);
                suite.addTestSuite(OutputLocationManagerTests.class);
                suite.addTest(IncrementalModelTests.suite());
                //suite.addTest(KnownLimitationsTests.class);

diff --git a/tests/src/org/aspectj/systemtest/AllTests15.java b/tests/src/org/aspectj/systemtest/AllTests15.java
index 3881f18d9b0c032b45e2f0ff9ea83de3f7715aee..09ed48206d2f0753b01abd4a746652f813d009c2 100644 (file)
--- a/tests/src/org/aspectj/systemtest/AllTests15.java
+++ b/tests/src/org/aspectj/systemtest/AllTests15.java
@@ -11,6 +11,8 @@ import org.aspectj.systemtest.ajc150.ataspectj.AtAjAnnotationGenTests;
 import org.aspectj.systemtest.ajc151.AllTestsAspectJ151;
 import org.aspectj.systemtest.ajc152.AllTestsAspectJ152;
 import org.aspectj.systemtest.ajc153.AllTestsAspectJ153;
+import org.aspectj.systemtest.incremental.tools.MultiProjectIncrementalTests;
+import org.aspectj.systemtest.xlint.XLint5Tests;
 
 public class AllTests15 {
 
@@ -23,6 +25,13 @@ public class AllTests15 {
                suite.addTest(AllTestsAspectJ152.suite());
                suite.addTest(AllTestsAspectJ153.suite());
                suite.addTest(AtAjAnnotationGenTests.suite());
+               /* FIXME maw Many of these tests do not depend on Java 5 but they
+                * cannot be executed in Eclipse with 1.3 because of XML issues and
+                * are excluded on the build machine so moving them here loses nothing
+                * for the moment.
+                */
+               suite.addTestSuite(MultiProjectIncrementalTests.class);
+               suite.addTest(XLint5Tests.suite());
                //$JUnit-END$
                return suite;
        }