special-casing 1.5 tests - now runs all non-java-5 tests in 1.3, and includes java 5 modules if running in a 1.5 VM.

1 files changed, 8 insertions, 1 deletions

diff --git a/run-all-junit-tests/testsrc/AllTests.java b/run-all-junit-tests/testsrc/AllTests.java
index cd0c439ad..95c03d7e1 100644
--- a/run-all-junit-tests/testsrc/AllTests.java
+++ b/run-all-junit-tests/testsrc/AllTests.java
@@ -11,6 +11,8 @@
  * ******************************************************************/
 
 // default package
+import org.aspectj.util.LangUtil;
+
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
@@ -29,7 +31,12 @@ public class AllTests extends TestCase {
         suite.addTest(TestingDriversModuleTests.suite());
         suite.addTest(UtilModuleTests.suite());
         suite.addTest(BcweaverModuleTests.suite());
-		suite.addTest(Aspectj5rtModuleTests.suite());
+        if (LangUtil.is15VMOrGreater()) {
+            suite.addTest(Aspectj5rtModuleTests.suite());
+            suite.addTest(Loadtime5ModuleTests.suite());
+        } else {
+            System.err.println("Warning: not running 1.5 tests");
+        }
         return suite;
     }