update to binary format as part of generics work, plus remove needless duplication of tests in RunTheseBeforeYouCommitTests

5 files changed, 5 insertions, 5 deletions

diff --git a/tests/new/options11/aspectlib1.jar b/tests/new/options11/aspectlib1.jar
index 680a8f76d..c0a824e75 100644
--- a/tests/new/options11/aspectlib1.jar
+++ b/tests/new/options11/aspectlib1.jar
diff --git a/tests/new/options11/aspectlib2.jar b/tests/new/options11/aspectlib2.jar
index cab875dee..3a1f8b2ba 100644
--- a/tests/new/options11/aspectlib2.jar
+++ b/tests/new/options11/aspectlib2.jar
diff --git a/tests/new/options11/injar.jar b/tests/new/options11/injar.jar
index 429473b8e..a70a43a12 100644
--- a/tests/new/options11/injar.jar
+++ b/tests/new/options11/injar.jar
diff --git a/tests/src/org/aspectj/systemtest/inpath/InPathTests.java b/tests/src/org/aspectj/systemtest/inpath/InPathTests.java
index 6bd3bf749..cecb3e85f 100644
--- a/tests/src/org/aspectj/systemtest/inpath/InPathTests.java
+++ b/tests/src/org/aspectj/systemtest/inpath/InPathTests.java
@@ -36,9 +36,10 @@ public class InPathTests extends org.aspectj.testing.XMLBasedAjcTestCase {
     runTest("options -injars checking declare parents interactions");
   }
 
-  public void test004(){
-    runTest("The compiler crashes when using aspect libraries created without using -noweave");
-  }
+// test removed from suite since aspects are *always* generated reweavable
+//  public void test004(){
+//    runTest("The compiler crashes when using aspect libraries created without using -noweave");
+//  }
 
   public void test005(){
     runTest("declare warnings on main");
diff --git a/tests/testsrc/TestsModuleTests.java b/tests/testsrc/TestsModuleTests.java
index 2c79a7dd4..8df16f222 100644
--- a/tests/testsrc/TestsModuleTests.java
+++ b/tests/testsrc/TestsModuleTests.java
@@ -25,9 +25,7 @@ public class TestsModuleTests extends TestCase {
         String name = TestsModuleTests.class.getName();
         TestSuite suite = new TestSuite(name);
         // compiler tests, wrapped for JUnit
-        suite.addTest(AllTests.suite());            
         if (LangUtil.is15VMOrGreater()) {
-            suite.addTest(AllTests14.suite());            
             suite.addTest(AllTests15.suite());
         } else if (LangUtil.is14VMOrGreater()) {
             System.err.println("Skipping tests for 1.5");
@@ -36,6 +34,7 @@ public class TestsModuleTests extends TestCase {
         } else {
             System.err.println("Skipping tests for 1.4 and 1.5");
             //suite.addTest(TestUtil.skipTest("for 1.4 and 1.5"));
+	        suite.addTest(AllTests.suite());            
         }
         return suite;
     }