updated for weaver5

2 files changed, 25 insertions, 92 deletions

diff --git a/run-all-junit-tests/.classpath b/run-all-junit-tests/.classpath
index 51b863ae4..efeaa0a30 100644
--- a/run-all-junit-tests/.classpath
+++ b/run-all-junit-tests/.classpath
@@ -1,96 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="testsrc">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/ajbrowser">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/ajde">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/asm">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/bridge">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/build">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/org.aspectj.ajdt.core">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/org.eclipse.jdt.core">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/runtime">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/taskdefs">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/testing">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/testing-client">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/testing-drivers">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/testing-util">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/util">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/weaver">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry sourcepath="/lib/junit/junit-src.jar" kind="lib" path="/lib/junit/junit.jar">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/tests">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry combineaccessrules="false" kind="src" path="/aspectj5rt">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry combineaccessrules="false" kind="src" path="/ajdoc">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry combineaccessrules="false" kind="src" path="/loadtime">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry combineaccessrules="false" kind="src" path="/loadtime5">
-		<attributes>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="src" path="testsrc"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path="/ajbrowser"/>
+	<classpathentry kind="src" path="/ajde"/>
+	<classpathentry kind="src" path="/asm"/>
+	<classpathentry kind="src" path="/bridge"/>
+	<classpathentry kind="src" path="/build"/>
+	<classpathentry kind="src" path="/org.aspectj.ajdt.core"/>
+	<classpathentry kind="src" path="/org.eclipse.jdt.core"/>
+	<classpathentry kind="src" path="/runtime"/>
+	<classpathentry kind="src" path="/taskdefs"/>
+	<classpathentry kind="src" path="/testing"/>
+	<classpathentry kind="src" path="/testing-client"/>
+	<classpathentry kind="src" path="/testing-drivers"/>
+	<classpathentry kind="src" path="/testing-util"/>
+	<classpathentry kind="src" path="/util"/>
+	<classpathentry kind="src" path="/weaver"/>
+	<classpathentry sourcepath="/lib/junit/junit-src.jar" kind="lib" path="/lib/junit/junit.jar"/>
+	<classpathentry kind="src" path="/tests"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/aspectj5rt"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ajdoc"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/loadtime"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/loadtime5"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/weaver5"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/run-all-junit-tests/testsrc/AllTests.java b/run-all-junit-tests/testsrc/AllTests.java
index 051d2deb1..d5db248b2 100644
--- a/run-all-junit-tests/testsrc/AllTests.java
+++ b/run-all-junit-tests/testsrc/AllTests.java
@@ -49,6 +49,7 @@ public class AllTests extends TestCase {
             TestUtil.loadTestsReflectively(suite, "Loadtime5ModuleTests", false);
             // this next one is built normally, but needs 1.5 rt.jar to pass
             suite.addTest(BcweaverModuleTests15.suite());
+            TestUtil.loadTestsReflectively(suite, "Weaver5ModuleTests",false);
         } else {
             suite.addTest(TestUtil.skipTest("for 1.5"));
         }