From 6ac43cae922d5998351287035f6b4d05040a4213 Mon Sep 17 00:00:00 2001
From: wisberg <wisberg>
Date: Sat, 21 May 2005 23:46:06 +0000
Subject: junit.excludes - yuck!

---
 build/build-properties.xml |  3 +++
 build/build.xml            | 31 +++++++++++++++----------------
 2 files changed, 18 insertions(+), 16 deletions(-)

(limited to 'build')

diff --git a/build/build-properties.xml b/build/build-properties.xml
index 2f4922b6d..99fb509fe 100644
--- a/build/build-properties.xml
+++ b/build/build-properties.xml
@@ -100,6 +100,9 @@
 			location="${aspectj.modules.lib.dir}/junit/junit.jar"/>
 		<property name="junit.includes" 
 	        value="**/*Test.java,**/**TestCase.java"/>	
+		<property name="junit.excludes" 
+	        value="**/DocumentParserTest.java,**/CommandTestCase.java,**/VerifyWeaveTestCase.java,**/KnownfailuresTests.java,**/KnownLimitationsTests.java,**/PureJavaTests.java,**/AbstractWorldTestCase.java,**/WeaveTestCase.java"/>	
+    	<!-- would like to enable PureJavaTests.java -->
     </target>
 
     <target name="init-taskdefs" 
diff --git a/build/build.xml b/build/build.xml
index 4d29581c7..cd385b273 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -282,22 +282,21 @@
     		<jvmarg value="-Xmx400m" />
 	        <formatter type="xml"/>
 	        <batchtest todir="${aj.junit.dir}">
-	            <fileset dir="${aspectj.modules.dir}/ajbrowser/testsrc" includes="${junit.includes}"/>
-	            <fileset dir="${aspectj.modules.dir}/ajde/testsrc" includes="${junit.includes}"/>
-	            <fileset dir="${aspectj.modules.dir}/ajdoc/testsrc" includes="${junit.includes}"/>
-	            <fileset dir="${aspectj.modules.dir}/asm/testsrc" includes="${junit.includes}"/>
-	            <fileset dir="${aspectj.modules.dir}/bridge/testsrc" includes="${junit.includes}"/>
-	            <fileset dir="${aspectj.modules.dir}/build/testsrc" includes="${junit.includes}"/>
-	            <fileset dir="${aspectj.modules.dir}/loadtime/testsrc" includes="${junit.includes}"/>
-	            <fileset dir="${aspectj.modules.dir}/org.aspectj.ajdt.core/testsrc" includes="${junit.includes}"/>
-	            <fileset dir="${aspectj.modules.dir}/runtime/testsrc" includes="${junit.includes}"/>
-	            <fileset dir="${aspectj.modules.dir}/taskdefs/testsrc" includes="${junit.includes}"/>
-	            <fileset dir="${aspectj.modules.dir}/testing/testsrc" includes="${junit.includes}"/>
-	            <fileset dir="${aspectj.modules.dir}/testing-client/testsrc" includes="${junit.includes}"/>
-	            <fileset dir="${aspectj.modules.dir}/testing-drivers/testsrc" includes="${junit.includes}"/>
-	            <fileset dir="${aspectj.modules.dir}/tests/src" includes="**/*Tests.java"/>
-	            <fileset dir="${aspectj.modules.dir}/util/testsrc" includes="${junit.includes}"/>
-	            <fileset dir="${aspectj.modules.dir}/weaver/testsrc" includes="${junit.includes}"/>
+	            <fileset dir="${aspectj.modules.dir}/ajde/testsrc" includes="${junit.includes}" excludes="${junit.excludes}"/>
+	            <fileset dir="${aspectj.modules.dir}/ajdoc/testsrc" includes="${junit.includes}" excludes="${junit.excludes}"/>
+	            <fileset dir="${aspectj.modules.dir}/asm/testsrc" includes="${junit.includes}" excludes="${junit.excludes}"/>
+	            <fileset dir="${aspectj.modules.dir}/bridge/testsrc" includes="${junit.includes}" excludes="${junit.excludes}"/>
+	            <fileset dir="${aspectj.modules.dir}/build/testsrc" includes="${junit.includes}" excludes="${junit.excludes}"/>
+	            <fileset dir="${aspectj.modules.dir}/loadtime/testsrc" includes="${junit.includes}" excludes="${junit.excludes}"/>
+	            <fileset dir="${aspectj.modules.dir}/org.aspectj.ajdt.core/testsrc" includes="${junit.includes}" excludes="${junit.excludes}"/>
+	            <fileset dir="${aspectj.modules.dir}/runtime/testsrc" includes="${junit.includes}" excludes="${junit.excludes}"/>
+	            <fileset dir="${aspectj.modules.dir}/taskdefs/testsrc" includes="${junit.includes}" excludes="${junit.excludes}"/>
+	            <fileset dir="${aspectj.modules.dir}/testing/testsrc" includes="${junit.includes}" excludes="${junit.excludes}"/>
+	            <fileset dir="${aspectj.modules.dir}/testing-client/testsrc" includes="${junit.includes}" excludes="${junit.excludes}"/>
+	            <fileset dir="${aspectj.modules.dir}/testing-drivers/testsrc" includes="${junit.includes}" excludes="${junit.excludes}"/>
+	            <fileset dir="${aspectj.modules.dir}/tests/src" includes="**/*Tests.java" excludes="${junit.excludes}"/>
+	            <fileset dir="${aspectj.modules.dir}/util/testsrc" includes="${junit.includes}" excludes="${junit.excludes}"/>
+	            <fileset dir="${aspectj.modules.dir}/weaver/testsrc" includes="${junit.includes}" excludes="${junit.excludes}"/>
 	        </batchtest>
 		</junit> 
 	    <antcall target="if.junitreport"/>
-- 
cgit v1.2.3