harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r499868 [1/3] - in /harmony/enhanced/classlib/trunk/modules: beans/ concurrent/ imageio/ instrument/ jndi/ lang-management/ lang-management/make/ logging/ luni/ math/ misc/ nio/ nio_char/ nio_char/make/ pack200/ pack200/make/ prefs/ prefs/m...
Date Thu, 25 Jan 2007 17:46:11 GMT
Author: ayza
Date: Thu Jan 25 09:46:03 2007
New Revision: 499868

URL: http://svn.apache.org/viewvc?view=rev&rev=499868
Log:
New exclude lists model introduced for the rest of classlib modules. This commit relates to HARMONY-2970.

Added:
    harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.common   (with props)
    harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.common   (with props)
    harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.common   (with props)
    harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.common   (with props)
    harmony/enhanced/classlib/trunk/modules/print/make/exclude.common   (with props)
    harmony/enhanced/classlib/trunk/modules/rmi/make/exclude.common   (with props)
    harmony/enhanced/classlib/trunk/modules/security/make/exclude.common   (with props)
    harmony/enhanced/classlib/trunk/modules/sound/make/exclude.common   (with props)
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.common   (with props)
    harmony/enhanced/classlib/trunk/modules/text/make/exclude.common   (with props)
Modified:
    harmony/enhanced/classlib/trunk/modules/beans/build.xml
    harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
    harmony/enhanced/classlib/trunk/modules/imageio/build.xml
    harmony/enhanced/classlib/trunk/modules/instrument/build.xml
    harmony/enhanced/classlib/trunk/modules/jndi/build.xml
    harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
    harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86.drl   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86.ibm   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86_64.drl   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86_64.ibm   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86.drl   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86.ibm   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86_64.drl   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86_64.ibm   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/logging/build.xml
    harmony/enhanced/classlib/trunk/modules/luni/build.xml
    harmony/enhanced/classlib/trunk/modules/math/build.xml
    harmony/enhanced/classlib/trunk/modules/misc/build.xml
    harmony/enhanced/classlib/trunk/modules/nio/build.xml
    harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
    harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86.drl
    harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86.ibm
    harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.windows.x86.drl
    harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.windows.x86.ibm
    harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.windows.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.windows.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/pack200/build.xml
    harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86.drl
    harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86.ibm
    harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86.drl
    harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86.ibm
    harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/prefs/build.xml
    harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86.drl
    harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86.ibm
    harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.windows.x86.drl
    harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.windows.x86.ibm
    harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.windows.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.windows.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/print/build.xml
    harmony/enhanced/classlib/trunk/modules/print/make/exclude.linux.x86.drl
    harmony/enhanced/classlib/trunk/modules/print/make/exclude.linux.x86.ibm
    harmony/enhanced/classlib/trunk/modules/print/make/exclude.linux.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/print/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/print/make/exclude.windows.x86.drl
    harmony/enhanced/classlib/trunk/modules/print/make/exclude.windows.x86.ibm
    harmony/enhanced/classlib/trunk/modules/print/make/exclude.windows.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/print/make/exclude.windows.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/regex/build.xml
    harmony/enhanced/classlib/trunk/modules/rmi/build.xml
    harmony/enhanced/classlib/trunk/modules/rmi/make/exclude.linux.x86.drl
    harmony/enhanced/classlib/trunk/modules/rmi/make/exclude.linux.x86.ibm
    harmony/enhanced/classlib/trunk/modules/rmi/make/exclude.linux.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/rmi/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/rmi/make/exclude.windows.x86.drl
    harmony/enhanced/classlib/trunk/modules/rmi/make/exclude.windows.x86.ibm
    harmony/enhanced/classlib/trunk/modules/rmi/make/exclude.windows.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/rmi/make/exclude.windows.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/security/build.xml
    harmony/enhanced/classlib/trunk/modules/sound/build.xml
    harmony/enhanced/classlib/trunk/modules/sound/make/exclude.linux.x86.drl
    harmony/enhanced/classlib/trunk/modules/sound/make/exclude.linux.x86.ibm
    harmony/enhanced/classlib/trunk/modules/sound/make/exclude.linux.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/sound/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/sound/make/exclude.windows.x86.drl
    harmony/enhanced/classlib/trunk/modules/sound/make/exclude.windows.x86.ibm
    harmony/enhanced/classlib/trunk/modules/sound/make/exclude.windows.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/sound/make/exclude.windows.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/sql/build.xml
    harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
    harmony/enhanced/classlib/trunk/modules/swing/build.xml
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.drl
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.ibm
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.drl
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.ibm
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/text/build.xml
    harmony/enhanced/classlib/trunk/modules/text/make/exclude.linux.x86.drl
    harmony/enhanced/classlib/trunk/modules/text/make/exclude.linux.x86.ibm
    harmony/enhanced/classlib/trunk/modules/text/make/exclude.linux.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/text/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/text/make/exclude.windows.x86.drl
    harmony/enhanced/classlib/trunk/modules/text/make/exclude.windows.x86.ibm
    harmony/enhanced/classlib/trunk/modules/text/make/exclude.windows.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/text/make/exclude.windows.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/tools/build.xml
    harmony/enhanced/classlib/trunk/modules/x-net/build.xml

Modified: harmony/enhanced/classlib/trunk/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/build.xml?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/build.xml Thu Jan 25 09:46:03 2007
@@ -39,11 +39,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <property name="beans.common.exclude.file" location="./make/exclude.common" />
-    <property name="beans.platform.exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}" />
-    <property name="beans.interm.exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}.interm" />
-
-    <property name="exclude.file" location="${hy.hdk}/build/beans.exclude" />
+    <property name="beans.exclude.file" location="${hy.hdk}/build/beans.exclude" />
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
@@ -194,26 +190,9 @@
         </javac>
     </target>
 
-    <target name="prepare-exclude" depends="-init-exclude, -add-common, -add-platform, -add-intermittent">
-    </target>
-
-    <target name="-init-exclude" >
-        <echo message="" file="${exclude.file}" />
-        <loadfile property="beans.common.exclude.exist" srcFile="${beans.common.exclude.file}" failonerror="false" />
-        <loadfile property="beans.platform.exclude.exist" srcFile="${beans.platform.exclude.file}" failonerror="false" />
-        <loadfile property="beans.interm.exclude.exist" srcFile="${beans.interm.exclude.file}" failonerror="false"/>
-    </target>
-
-    <target name="-add-common" if="beans.common.exclude.exist" >
-        <echo message="${beans.common.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
-    </target>
-
-    <target name="-add-platform" if="beans.platform.exclude.exist" >
-        <echo message="${beans.platform.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
-    </target>
-
-    <target name="-add-intermittent" if="beans.interm.exclude.exist" >
-        <echo message="${beans.interm.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
+    <target name="prepare-exclude">
+       <prepare-exclude-list moduleName="beans" dir="./make"
+                             result="${beans.exclude.file}"/>
     </target>
 
     <target name="run-tests">
@@ -291,7 +270,7 @@
 
                 <fileset dir="${hy.beans.src.test.java}">
                     <include name="**/*Test.java"/>
-                    <excludesfile name="${exclude.file}" />
+                    <excludesfile name="${beans.exclude.file}" />
                 </fileset>
             </batchtest>
         </junit>

Modified: harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/concurrent/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/concurrent/build.xml Thu Jan 25 09:46:03 2007
@@ -43,9 +43,7 @@
         </or>
     </fileset>
 
-    <property name="concurrent.common.exclude.file" location="./make/exclude.common" />
-    <property name="concurrent.platform.exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}" />
-    <property name="concurrent.interm.exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}.interm" />
+    <property name="concurrent.exclude.file" location="${hy.hdk}/build/concurrent.exclude" />
 
     <property name="exclude.file" location="${hy.hdk}/build/concurrent.exclude" />
 
@@ -149,26 +147,9 @@
         </javac>
     </target>
 
-    <target name="prepare-exclude" depends="-init-exclude, -add-common, -add-platform, -add-intermittent">
-    </target>
-
-    <target name="-init-exclude" >
-        <echo message="" file="${exclude.file}" />
-        <loadfile property="concurrent.common.exclude.exist" srcFile="${concurrent.common.exclude.file}" failonerror="false" />
-        <loadfile property="concurrent.platform.exclude.exist" srcFile="${concurrent.platform.exclude.file}" failonerror="false" />
-        <loadfile property="concurrent.interm.exclude.exist" srcFile="${concurrent.interm.exclude.file}" failonerror="false"/>
-    </target>
-
-    <target name="-add-common" if="concurrent.common.exclude.exist" >
-        <echo message="${concurrent.common.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
-    </target>
-
-    <target name="-add-platform" if="concurrent.platform.exclude.exist" >
-        <echo message="${concurrent.platform.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
-    </target>
-
-    <target name="-add-intermittent" if="concurrent.interm.exclude.exist" >
-        <echo message="${concurrent.interm.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
+    <target name="prepare-exclude">
+       <prepare-exclude-list moduleName="concurrent" dir="./make"
+                             result="${concurrent.exclude.file}"/>
     </target>
 
     <target name="run-tests">
@@ -202,7 +183,7 @@
                 unless="test.case">
 
                 <fileset dir="${hy.concurrent.src.test.java}">
-                    <excludesfile name="${exclude.file}" />
+                    <excludesfile name="${concurrent.exclude.file}" />
                 </fileset>
 
             </batchtest>

Modified: harmony/enhanced/classlib/trunk/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/build.xml?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/build.xml Thu Jan 25 09:46:03 2007
@@ -37,11 +37,7 @@
         </or>
     </fileset>
 
-    <property name="imageio.common.exclude.file" location="./make/exclude.common" />
-    <property name="imageio.platform.exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}" />
-    <property name="imageio.interm.exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}.interm" />
-
-    <property name="exclude.file" location="${hy.hdk}/build/imageio.exclude" />
+    <property name="imageio.exclude.file" location="${hy.hdk}/build/imageio.exclude" />
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
@@ -59,26 +55,9 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, compile-tests, prepare-exclude, run-tests" />
 
-    <target name="prepare-exclude" depends="-init-exclude, -add-common, -add-platform, -add-intermittent">
-    </target>
-
-    <target name="-init-exclude" >
-        <echo message="" file="${exclude.file}" />
-        <loadfile property="imageio.common.exclude.exist" srcFile="${imageio.common.exclude.file}" failonerror="false" />
-        <loadfile property="imageio.platform.exclude.exist" srcFile="${imageio.platform.exclude.file}" failonerror="false" />
-        <loadfile property="imageio.interm.exclude.exist" srcFile="${imageio.interm.exclude.file}" failonerror="false"/>
-    </target>
-
-    <target name="-add-common" if="imageio.common.exclude.exist" >
-        <echo message="${imageio.common.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
-    </target>
-
-    <target name="-add-platform" if="imageio.platform.exclude.exist" >
-        <echo message="${imageio.platform.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
-    </target>
-
-    <target name="-add-intermittent" if="imageio.interm.exclude.exist" >
-        <echo message="${imageio.interm.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
+    <target name="prepare-exclude">
+       <prepare-exclude-list moduleName="imageio" dir="./make"
+                             result="${imageio.exclude.file}"/>
     </target>
 
     <target name="clean">
@@ -217,7 +196,7 @@
                 unless="test.case">
 
                 <fileset dir="${hy.imageio.src.test.java}" >
-                    <excludesfile name="${exclude.file}" />
+                    <excludesfile name="${imageio.exclude.file}" />
                 </fileset>
             </batchtest>
         </junit>

Modified: harmony/enhanced/classlib/trunk/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/build.xml?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/build.xml Thu Jan 25 09:46:03 2007
@@ -39,11 +39,7 @@
     
     <property name="iculib.zip" location="${depends.oss}/icu4c-3.4-harmony.zip" />
 
-    <property name="instrument.common.exclude.file" location="./make/exclude.common" />
-    <property name="instrument.platform.exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}" />
-    <property name="instrument.interm.exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}.interm" />
-
-    <property name="exclude.file" location="${hy.hdk}/build/instrument.exclude" />
+    <property name="instrument.exclude.file" location="${hy.hdk}/build/instrument.exclude" />
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
@@ -176,26 +172,9 @@
         </javac>
     </target>
 
-    <target name="prepare-exclude" depends="-init-exclude, -add-common, -add-platform, -add-intermittent">
-    </target>
-
-    <target name="-init-exclude" >
-        <echo message="" file="${exclude.file}" />
-        <loadfile property="instrument.common.exclude.exist" srcFile="${instrument.common.exclude.file}" failonerror="false" />
-        <loadfile property="instrument.platform.exclude.exist" srcFile="${instrument.platform.exclude.file}" failonerror="false" />
-        <loadfile property="instrument.interm.exclude.exist" srcFile="${instrument.interm.exclude.file}" failonerror="false"/>
-    </target>
-
-    <target name="-add-common" if="instrument.common.exclude.exist" >
-        <echo message="${instrument.common.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
-    </target>
-
-    <target name="-add-platform" if="instrument.platform.exclude.exist" >
-        <echo message="${instrument.platform.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
-    </target>
-
-    <target name="-add-intermittent" if="instrument.interm.exclude.exist" >
-        <echo message="${instrument.interm.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
+    <target name="prepare-exclude">
+       <prepare-exclude-list moduleName="instrument" dir="./make"
+                             result="${instrument.exclude.file}"/>
     </target>
     
     <target name="run-tests">
@@ -231,7 +210,7 @@
 
                 <fileset dir="${hy.instrument.src.test.java}">
                     <include name="**/*Test.java" />
-                    <excludesfile name="${exclude.file}" />
+                    <excludesfile name="${instrument.exclude.file}" />
                 </fileset>
             </batchtest>
         </junit>

Modified: harmony/enhanced/classlib/trunk/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/build.xml?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/build.xml Thu Jan 25 09:46:03 2007
@@ -37,11 +37,7 @@
         </or>
     </fileset>
 
-    <property name="jndi.common.exclude.file" location="./make/exclude.common" />
-    <property name="jndi.platform.exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}" />
-    <property name="jndi.interm.exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}.interm" />
-
-    <property name="exclude.file" location="${hy.hdk}/build/jndi.exclude" />
+    <property name="jndi.exclude.file" location="${hy.hdk}/build/jndi.exclude" />
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
@@ -147,26 +143,9 @@
         </javac>
     </target>
 
-    <target name="prepare-exclude" depends="-init-exclude, -add-common, -add-platform, -add-intermittent">
-    </target>
-
-    <target name="-init-exclude" >
-        <echo message="" file="${exclude.file}" />
-        <loadfile property="jndi.common.exclude.exist" srcFile="${jndi.common.exclude.file}" failonerror="false" />
-        <loadfile property="jndi.platform.exclude.exist" srcFile="${jndi.platform.exclude.file}" failonerror="false" />
-        <loadfile property="jndi.interm.exclude.exist" srcFile="${jndi.interm.exclude.file}" failonerror="false"/>
-    </target>
-
-    <target name="-add-common" if="jndi.common.exclude.exist" >
-        <echo message="${jndi.common.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
-    </target>
-
-    <target name="-add-platform" if="jndi.platform.exclude.exist" >
-        <echo message="${jndi.platform.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
-    </target>
-
-    <target name="-add-intermittent" if="jndi.interm.exclude.exist" >
-        <echo message="${jndi.interm.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
+    <target name="prepare-exclude">
+       <prepare-exclude-list moduleName="jndi" dir="./make"
+                             result="${jndi.exclude.file}"/>
     </target>
 
     <target name="run-tests">
@@ -202,7 +181,7 @@
 
                 <fileset dir="${hy.jndi.src.test.java}">
                     <include name="**/*Test.java"/>
-                    <excludesfile name="${exclude.file}" />
+                    <excludesfile name="${jndi.exclude.file}" />
 
                     <!--  These tests run in a separate jvm below -->
                     <exclude name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerBuilderTest.java" />

Modified: harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/lang-management/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/lang-management/build.xml Thu Jan 25 09:46:03 2007
@@ -35,7 +35,7 @@
         </or>
     </fileset>
 
-    <property name="exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}" />
+    <property name="lang-management.exclude.file" location="${hy.hdk}/build/lang-management.exclude" />
 
     <target name="build" depends="compile-java, build-jar" />
 
@@ -51,7 +51,7 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="-test-module" depends="build, compile-tests, run-tests" />
+    <target name="-test-module" depends="build, compile-tests, prepare-exclude, run-tests" />
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/${hy.lang-management.packaging.jarname}.jar" />
@@ -162,6 +162,11 @@
         </javac>
     </target>
 
+    <target name="prepare-exclude">
+       <prepare-exclude-list moduleName="lang-management" dir="./make"
+                             result="${lang-management.exclude.file}"/>
+    </target>
+
     <target name="run-tests">
         <antcall target="run-tests-api" />
         <antcall target="run-tests-impl" />
@@ -196,7 +201,7 @@
             <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
                 <fileset dir="${hy.lang-management.src.test.api.java}" >
                     <include name="**/*Test.java"/>
-                    <excludesfile name="${exclude.file}" />
+                    <excludesfile name="${lang-management.exclude.file}" />
                 </fileset>
             </batchtest>
         </junit>
@@ -233,7 +238,7 @@
             <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
                 <fileset dir="${hy.lang-management.src.test.impl.java}">
                     <include name="**/*Test.java" />
-                    <excludesfile name="${exclude.file}" />
+                    <excludesfile name="${lang-management.exclude.file}" />
                 </fileset>
             </batchtest>
         </junit>

Added: harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.common
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.common?view=auto&rev=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.common (added)
+++ harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.common Thu Jan 25 09:46:03 2007
@@ -0,0 +1,27 @@
+org/apache/harmony/lang/management/ClassLoadingMXBeanImplTest.java
+org/apache/harmony/lang/management/CompilationMXBeanImplTest.java
+org/apache/harmony/lang/management/DynamicMXBeanImplTest.java
+org/apache/harmony/lang/management/GarbageCollectorMXBeanImplTest.java
+org/apache/harmony/lang/management/LoggingMXBeanImplTest.java
+org/apache/harmony/lang/management/MemoryManagerImplTest.java
+org/apache/harmony/lang/management/MemoryMXBeanImplTest.java
+org/apache/harmony/lang/management/MemoryPoolMXBeanImplTest.java
+org/apache/harmony/lang/management/MultiInstanceDynamicMXBeanImplTest.java
+org/apache/harmony/lang/management/RuntimeMXBeanImplTest.java
+org/apache/harmony/lang/management/SingleInstanceDynamicMXBeanImplTest.java
+org/apache/harmony/lang/management/ThreadInfoTest.java
+org/apache/harmony/lang/management/ThreadMXBeanImplTest.java
+
+org/apache/harmony/lang/management/tests/java/lang/management/ClassLoadingMXBeanTest.java
+org/apache/harmony/lang/management/tests/java/lang/management/CompilationMXBeanTest.java
+org/apache/harmony/lang/management/tests/java/lang/management/GarbageCollectorMXBeanTest.java
+org/apache/harmony/lang/management/tests/java/lang/management/LoggingMXBeanTest.java
+org/apache/harmony/lang/management/tests/java/lang/management/ManagementFactoryTest.java
+org/apache/harmony/lang/management/tests/java/lang/management/MemoryManagerMXBeanTest.java
+org/apache/harmony/lang/management/tests/java/lang/management/MemoryMXBeanTest.java
+org/apache/harmony/lang/management/tests/java/lang/management/MemoryPoolMXBeanTest.java
+org/apache/harmony/lang/management/tests/java/lang/management/MemoryUsageTest.java
+org/apache/harmony/lang/management/tests/java/lang/management/RuntimeMXBeanTest.java
+org/apache/harmony/lang/management/tests/java/lang/management/ThreadMXBeanTest.java
+
+tests/java/util/logging/LoggingMXBeanTest.java

Propchange: harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.common
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86.drl?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86.drl Thu Jan 25 09:46:03 2007
@@ -1,27 +0,0 @@
-org/apache/harmony/lang/management/ClassLoadingMXBeanImplTest.java
-org/apache/harmony/lang/management/CompilationMXBeanImplTest.java
-org/apache/harmony/lang/management/DynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/GarbageCollectorMXBeanImplTest.java
-org/apache/harmony/lang/management/LoggingMXBeanImplTest.java
-org/apache/harmony/lang/management/MemoryManagerImplTest.java
-org/apache/harmony/lang/management/MemoryMXBeanImplTest.java
-org/apache/harmony/lang/management/MemoryPoolMXBeanImplTest.java
-org/apache/harmony/lang/management/MultiInstanceDynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/RuntimeMXBeanImplTest.java
-org/apache/harmony/lang/management/SingleInstanceDynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/ThreadInfoTest.java
-org/apache/harmony/lang/management/ThreadMXBeanImplTest.java
-
-org/apache/harmony/lang/management/tests/java/lang/management/ClassLoadingMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/CompilationMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/GarbageCollectorMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/LoggingMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/ManagementFactoryTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryManagerMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryPoolMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryUsageTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/RuntimeMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/ThreadMXBeanTest.java
-
-tests/java/util/logging/LoggingMXBeanTest.java
\ No newline at end of file

Propchange: harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86.drl
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86.ibm?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86.ibm Thu Jan 25 09:46:03 2007
@@ -1,27 +0,0 @@
-org/apache/harmony/lang/management/ClassLoadingMXBeanImplTest.java
-org/apache/harmony/lang/management/CompilationMXBeanImplTest.java
-org/apache/harmony/lang/management/DynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/GarbageCollectorMXBeanImplTest.java
-org/apache/harmony/lang/management/LoggingMXBeanImplTest.java
-org/apache/harmony/lang/management/MemoryManagerImplTest.java
-org/apache/harmony/lang/management/MemoryMXBeanImplTest.java
-org/apache/harmony/lang/management/MemoryPoolMXBeanImplTest.java
-org/apache/harmony/lang/management/MultiInstanceDynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/RuntimeMXBeanImplTest.java
-org/apache/harmony/lang/management/SingleInstanceDynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/ThreadInfoTest.java
-org/apache/harmony/lang/management/ThreadMXBeanImplTest.java
-
-org/apache/harmony/lang/management/tests/java/lang/management/ClassLoadingMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/CompilationMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/GarbageCollectorMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/LoggingMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/ManagementFactoryTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryManagerMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryPoolMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryUsageTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/RuntimeMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/ThreadMXBeanTest.java
-
-tests/java/util/logging/LoggingMXBeanTest.java
\ No newline at end of file

Propchange: harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86.ibm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86_64.drl?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86_64.drl Thu Jan 25 09:46:03 2007
@@ -1,27 +0,0 @@
-org/apache/harmony/lang/management/ClassLoadingMXBeanImplTest.java
-org/apache/harmony/lang/management/CompilationMXBeanImplTest.java
-org/apache/harmony/lang/management/DynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/GarbageCollectorMXBeanImplTest.java
-org/apache/harmony/lang/management/LoggingMXBeanImplTest.java
-org/apache/harmony/lang/management/MemoryManagerImplTest.java
-org/apache/harmony/lang/management/MemoryMXBeanImplTest.java
-org/apache/harmony/lang/management/MemoryPoolMXBeanImplTest.java
-org/apache/harmony/lang/management/MultiInstanceDynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/RuntimeMXBeanImplTest.java
-org/apache/harmony/lang/management/SingleInstanceDynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/ThreadInfoTest.java
-org/apache/harmony/lang/management/ThreadMXBeanImplTest.java
-
-org/apache/harmony/lang/management/tests/java/lang/management/ClassLoadingMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/CompilationMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/GarbageCollectorMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/LoggingMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/ManagementFactoryTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryManagerMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryPoolMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryUsageTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/RuntimeMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/ThreadMXBeanTest.java
-
-tests/java/util/logging/LoggingMXBeanTest.java
\ No newline at end of file

Propchange: harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86_64.drl
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86_64.ibm?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86_64.ibm Thu Jan 25 09:46:03 2007
@@ -1,27 +0,0 @@
-org/apache/harmony/lang/management/ClassLoadingMXBeanImplTest.java
-org/apache/harmony/lang/management/CompilationMXBeanImplTest.java
-org/apache/harmony/lang/management/DynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/GarbageCollectorMXBeanImplTest.java
-org/apache/harmony/lang/management/LoggingMXBeanImplTest.java
-org/apache/harmony/lang/management/MemoryManagerImplTest.java
-org/apache/harmony/lang/management/MemoryMXBeanImplTest.java
-org/apache/harmony/lang/management/MemoryPoolMXBeanImplTest.java
-org/apache/harmony/lang/management/MultiInstanceDynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/RuntimeMXBeanImplTest.java
-org/apache/harmony/lang/management/SingleInstanceDynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/ThreadInfoTest.java
-org/apache/harmony/lang/management/ThreadMXBeanImplTest.java
-
-org/apache/harmony/lang/management/tests/java/lang/management/ClassLoadingMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/CompilationMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/GarbageCollectorMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/LoggingMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/ManagementFactoryTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryManagerMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryPoolMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryUsageTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/RuntimeMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/ThreadMXBeanTest.java
-
-tests/java/util/logging/LoggingMXBeanTest.java
\ No newline at end of file

Propchange: harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86_64.ibm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86.drl?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86.drl Thu Jan 25 09:46:03 2007
@@ -1,27 +0,0 @@
-org/apache/harmony/lang/management/ClassLoadingMXBeanImplTest.java
-org/apache/harmony/lang/management/CompilationMXBeanImplTest.java
-org/apache/harmony/lang/management/DynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/GarbageCollectorMXBeanImplTest.java
-org/apache/harmony/lang/management/LoggingMXBeanImplTest.java
-org/apache/harmony/lang/management/MemoryManagerImplTest.java
-org/apache/harmony/lang/management/MemoryMXBeanImplTest.java
-org/apache/harmony/lang/management/MemoryPoolMXBeanImplTest.java
-org/apache/harmony/lang/management/MultiInstanceDynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/RuntimeMXBeanImplTest.java
-org/apache/harmony/lang/management/SingleInstanceDynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/ThreadInfoTest.java
-org/apache/harmony/lang/management/ThreadMXBeanImplTest.java
-
-org/apache/harmony/lang/management/tests/java/lang/management/ClassLoadingMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/CompilationMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/GarbageCollectorMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/LoggingMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/ManagementFactoryTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryManagerMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryPoolMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryUsageTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/RuntimeMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/ThreadMXBeanTest.java
-
-tests/java/util/logging/LoggingMXBeanTest.java
\ No newline at end of file

Propchange: harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86.drl
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86.ibm?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86.ibm Thu Jan 25 09:46:03 2007
@@ -1,27 +0,0 @@
-org/apache/harmony/lang/management/ClassLoadingMXBeanImplTest.java
-org/apache/harmony/lang/management/CompilationMXBeanImplTest.java
-org/apache/harmony/lang/management/DynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/GarbageCollectorMXBeanImplTest.java
-org/apache/harmony/lang/management/LoggingMXBeanImplTest.java
-org/apache/harmony/lang/management/MemoryManagerImplTest.java
-org/apache/harmony/lang/management/MemoryMXBeanImplTest.java
-org/apache/harmony/lang/management/MemoryPoolMXBeanImplTest.java
-org/apache/harmony/lang/management/MultiInstanceDynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/RuntimeMXBeanImplTest.java
-org/apache/harmony/lang/management/SingleInstanceDynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/ThreadInfoTest.java
-org/apache/harmony/lang/management/ThreadMXBeanImplTest.java
-
-org/apache/harmony/lang/management/tests/java/lang/management/ClassLoadingMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/CompilationMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/GarbageCollectorMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/LoggingMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/ManagementFactoryTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryManagerMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryPoolMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryUsageTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/RuntimeMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/ThreadMXBeanTest.java
-
-tests/java/util/logging/LoggingMXBeanTest.java
\ No newline at end of file

Propchange: harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86.ibm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86_64.drl?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86_64.drl Thu Jan 25 09:46:03 2007
@@ -1,27 +0,0 @@
-org/apache/harmony/lang/management/ClassLoadingMXBeanImplTest.java
-org/apache/harmony/lang/management/CompilationMXBeanImplTest.java
-org/apache/harmony/lang/management/DynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/GarbageCollectorMXBeanImplTest.java
-org/apache/harmony/lang/management/LoggingMXBeanImplTest.java
-org/apache/harmony/lang/management/MemoryManagerImplTest.java
-org/apache/harmony/lang/management/MemoryMXBeanImplTest.java
-org/apache/harmony/lang/management/MemoryPoolMXBeanImplTest.java
-org/apache/harmony/lang/management/MultiInstanceDynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/RuntimeMXBeanImplTest.java
-org/apache/harmony/lang/management/SingleInstanceDynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/ThreadInfoTest.java
-org/apache/harmony/lang/management/ThreadMXBeanImplTest.java
-
-org/apache/harmony/lang/management/tests/java/lang/management/ClassLoadingMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/CompilationMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/GarbageCollectorMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/LoggingMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/ManagementFactoryTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryManagerMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryPoolMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryUsageTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/RuntimeMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/ThreadMXBeanTest.java
-
-tests/java/util/logging/LoggingMXBeanTest.java
\ No newline at end of file

Propchange: harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86_64.drl
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86_64.ibm?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86_64.ibm Thu Jan 25 09:46:03 2007
@@ -1,27 +0,0 @@
-org/apache/harmony/lang/management/ClassLoadingMXBeanImplTest.java
-org/apache/harmony/lang/management/CompilationMXBeanImplTest.java
-org/apache/harmony/lang/management/DynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/GarbageCollectorMXBeanImplTest.java
-org/apache/harmony/lang/management/LoggingMXBeanImplTest.java
-org/apache/harmony/lang/management/MemoryManagerImplTest.java
-org/apache/harmony/lang/management/MemoryMXBeanImplTest.java
-org/apache/harmony/lang/management/MemoryPoolMXBeanImplTest.java
-org/apache/harmony/lang/management/MultiInstanceDynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/RuntimeMXBeanImplTest.java
-org/apache/harmony/lang/management/SingleInstanceDynamicMXBeanImplTest.java
-org/apache/harmony/lang/management/ThreadInfoTest.java
-org/apache/harmony/lang/management/ThreadMXBeanImplTest.java
-
-org/apache/harmony/lang/management/tests/java/lang/management/ClassLoadingMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/CompilationMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/GarbageCollectorMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/LoggingMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/ManagementFactoryTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryManagerMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryPoolMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/MemoryUsageTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/RuntimeMXBeanTest.java
-org/apache/harmony/lang/management/tests/java/lang/management/ThreadMXBeanTest.java
-
-tests/java/util/logging/LoggingMXBeanTest.java
\ No newline at end of file

Propchange: harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.windows.x86_64.ibm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/logging/build.xml?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/logging/build.xml Thu Jan 25 09:46:03 2007
@@ -37,11 +37,7 @@
         </or>
     </fileset>
 
-    <property name="logging.common.exclude.file" location="./make/exclude.common" />
-    <property name="logging.platform.exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}" />
-    <property name="logging.interm.exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}.interm" />
-
-    <property name="exclude.file" location="${hy.hdk}/build/logging.exclude" />
+    <property name="logging.exclude.file" location="${hy.hdk}/build/logging.exclude" />
 
     <target name="build" depends="compile-java, copy-jar-resources, build-jar, copy-resources" />
 
@@ -59,28 +55,6 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, compile-tests, prepare-exclude, run-tests" />
 
-    <target name="prepare-exclude" depends="-init-exclude, -add-common, -add-platform, -add-intermittent">
-    </target>
-
-    <target name="-init-exclude" >
-        <echo message="" file="${exclude.file}" />
-        <loadfile property="logging.common.exclude.exist" srcFile="${logging.common.exclude.file}" failonerror="false" />
-        <loadfile property="logging.platform.exclude.exist" srcFile="${logging.platform.exclude.file}" failonerror="false" />
-        <loadfile property="logging.interm.exclude.exist" srcFile="${logging.interm.exclude.file}" failonerror="false"/>
-    </target>
-
-    <target name="-add-common" if="logging.common.exclude.exist" >
-        <echo message="${logging.common.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
-    </target>
-
-    <target name="-add-platform" if="logging.platform.exclude.exist" >
-        <echo message="${logging.platform.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
-    </target>
-
-    <target name="-add-intermittent" if="logging.interm.exclude.exist" >
-        <echo message="${logging.interm.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
-    </target>
-
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/logging.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/logging-src.jar" />
@@ -182,6 +156,11 @@
         </javac>
     </target>
 
+    <target name="prepare-exclude">
+       <prepare-exclude-list moduleName="logging" dir="./make"
+                             result="${logging.exclude.file}"/>
+    </target>
+
     <target name="run-tests">
 
         <mkdir dir="${hy.tests.reports}" />
@@ -230,7 +209,7 @@
 
                 <fileset dir="${hy.logging.src.test.java}">
                     <include name="org/apache/harmony/logging/tests/java/util/logging/*Test.java"/>
-                    <excludesfile name="${exclude.file}" />
+                    <excludesfile name="${logging.exclude.file}" />
 
                     <exclude name="org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java" />
                 </fileset>

Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Thu Jan 25 09:46:03 2007
@@ -40,11 +40,7 @@
     <property file="../../make/depends.properties" />
     <property name="fdlibm.zip" location="${depends.oss}/fdlibm_5.2.zip" />
 
-    <property name="luni.common.exclude.file" location="./make/exclude.common" />
-    <property name="luni.platform.exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}" />
-    <property name="luni.interm.exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}.interm" />
-
-    <property name="exclude.file" location="${hy.hdk}/build/luni.exclude" />
+    <property name="luni.exclude.file" location="${hy.hdk}/build/luni.exclude" />
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
@@ -273,26 +269,9 @@
         </compile-tests>
     </target>
 
-    <target name="prepare-exclude" depends="-init-exclude, -add-common, -add-platform, -add-intermittent">
-    </target>
-
-    <target name="-init-exclude" >
-        <echo message="" file="${exclude.file}" />
-        <loadfile property="luni.common.exclude.exist" srcFile="${luni.common.exclude.file}" failonerror="false" />
-        <loadfile property="luni.platform.exclude.exist" srcFile="${luni.platform.exclude.file}" failonerror="false" />
-        <loadfile property="luni.interm.exclude.exist" srcFile="${luni.interm.exclude.file}" failonerror="false"/>
-    </target>
-
-    <target name="-add-common" if="luni.common.exclude.exist" >
-        <echo message="${luni.common.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
-    </target>
-
-    <target name="-add-platform" if="luni.platform.exclude.exist" >
-        <echo message="${luni.platform.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
-    </target>
-
-    <target name="-add-intermittent" if="luni.interm.exclude.exist" >
-        <echo message="${luni.interm.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
+    <target name="prepare-exclude">
+       <prepare-exclude-list moduleName="luni" dir="./make"
+                             result="${luni.exclude.file}"/>
     </target>
 
     <target name="run-tests">
@@ -314,7 +293,7 @@
                 <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
                     <fileset dir="${hy.luni.src.test}/java">
                         <include name="**/*Test.java"/>
-                        <excludesfile name="${exclude.file}" />
+                        <excludesfile name="${luni.exclude.file}" />
                     </fileset>
                 </batchtest>
 

Modified: harmony/enhanced/classlib/trunk/modules/math/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/math/build.xml?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/math/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/math/build.xml Thu Jan 25 09:46:03 2007
@@ -37,11 +37,7 @@
         </or>
     </fileset>
 
-    <property name="math.common.exclude.file" location="./make/exclude.common" />
-    <property name="math.platform.exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}" />
-    <property name="math.interm.exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}.interm" />
-
-    <property name="exclude.file" location="${hy.hdk}/build/math.exclude" />
+    <property name="math.exclude.file" location="${hy.hdk}/build/math.exclude" />
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
@@ -147,26 +143,9 @@
         </javac>
     </target>
 
-    <target name="prepare-exclude" depends="-init-exclude, -add-common, -add-platform, -add-intermittent">
-    </target>
-
-    <target name="-init-exclude" >
-        <echo message="" file="${exclude.file}" />
-        <loadfile property="math.common.exclude.exist" srcFile="${math.common.exclude.file}" failonerror="false" />
-        <loadfile property="math.platform.exclude.exist" srcFile="${math.platform.exclude.file}" failonerror="false" />
-        <loadfile property="math.interm.exclude.exist" srcFile="${math.interm.exclude.file}" failonerror="false"/>
-    </target>
-
-    <target name="-add-common" if="math.common.exclude.exist" >
-        <echo message="${math.common.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
-    </target>
-
-    <target name="-add-platform" if="math.platform.exclude.exist" >
-        <echo message="${math.platform.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
-    </target>
-
-    <target name="-add-intermittent" if="math.interm.exclude.exist" >
-        <echo message="${math.interm.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
+    <target name="prepare-exclude">
+       <prepare-exclude-list moduleName="math" dir="./make"
+                             result="${math.exclude.file}"/>
     </target>
 
     <target name="run-tests">
@@ -201,7 +180,7 @@
 
                 <fileset dir="${hy.math.src.test.java}">
                     <include name="**/*Test.java" />
-                    <excludesfile name="${exclude.file}" />
+                    <excludesfile name="${math.exclude.file}" />
                 </fileset>
             </batchtest>
         </junit>

Modified: harmony/enhanced/classlib/trunk/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/build.xml?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/build.xml Thu Jan 25 09:46:03 2007
@@ -39,11 +39,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <property name="misc.common.exclude.file" location="./make/exclude.common" />
-    <property name="misc.platform.exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}" />
-    <property name="misc.interm.exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}.interm" />
-
-    <property name="exclude.file" location="${hy.hdk}/build/misc.exclude" />
+    <property name="misc.exclude.file" location="${hy.hdk}/build/misc.exclude" />
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
@@ -166,26 +162,9 @@
         </javac>
     </target>
 
-    <target name="prepare-exclude" depends="-init-exclude, -add-common, -add-platform, -add-intermittent">
-    </target>
-
-    <target name="-init-exclude" >
-        <echo message="" file="${exclude.file}" />
-        <loadfile property="misc.common.exclude.exist" srcFile="${misc.common.exclude.file}" failonerror="false" />
-        <loadfile property="misc.platform.exclude.exist" srcFile="${misc.platform.exclude.file}" failonerror="false" />
-        <loadfile property="misc.interm.exclude.exist" srcFile="${misc.interm.exclude.file}" failonerror="false"/>
-    </target>
-
-    <target name="-add-common" if="misc.common.exclude.exist" >
-        <echo message="${misc.common.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
-    </target>
-
-    <target name="-add-platform" if="misc.platform.exclude.exist" >
-        <echo message="${misc.platform.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
-    </target>
-
-    <target name="-add-intermittent" if="misc.interm.exclude.exist" >
-        <echo message="${misc.interm.exclude.exist}${line.separator}" file="${exclude.file}" append="true" />
+    <target name="prepare-exclude">
+       <prepare-exclude-list moduleName="misc" dir="./make"
+                             result="${misc.exclude.file}"/>
     </target>
 
     <target name="run-tests">
@@ -219,7 +198,7 @@
 
                 <fileset dir="${hy.misc.src.test.java}">
                     <include name="**/*Test.java" />
-                    <excludesfile name="${exclude.file}" />
+                    <excludesfile name="${misc.exclude.file}" />
                 </fileset>
             </batchtest>
         </junit>

Modified: harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/build.xml?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/build.xml Thu Jan 25 09:46:03 2007
@@ -28,8 +28,8 @@
 
     <property name="hy.nio.src.test.java.platform"
               value="${hy.nio.src.test.java}/../${hy.os.family}" />
-    <property name="exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}" />
 
+    <property name="nio.exclude.file" location="${hy.hdk}/build/nio.exclude" />
 
     <fileset id="classes" dir="${hy.build}">
         <or>
@@ -62,7 +62,7 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="-test-module" depends="build, compile-tests, run-tests" />
+    <target name="-test-module" depends="build, compile-tests, prepare-exclude, run-tests" />
 
     <!-- Build natives.-->
     <target name="build-native">
@@ -175,6 +175,11 @@
         </javac>
     </target>
 
+    <target name="prepare-exclude">
+       <prepare-exclude-list moduleName="nio" dir="./make"
+                             result="${nio.exclude.file}"/>
+    </target>
+
     <target name="run-tests">
         <mkdir dir="${hy.tests.reports}" />
 
@@ -203,7 +208,7 @@
             <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
                 <fileset dir="${hy.nio.src.test.java}">
                     <include name="**/*Test.java" />
-                    <excludesfile name="${exclude.file}" />
+                    <excludesfile name="${nio.exclude.file}" />
                 </fileset>
                 <fileset dir="${hy.nio.src.test.java.platform}">
                     <include name="**/*Test.java" />

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Thu Jan 25 09:46:03 2007
@@ -39,7 +39,7 @@
         </or>
     </fileset>
 
-    <property name="exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}" />
+    <property name="nio_char.exclude.file" location="${hy.hdk}/build/nio_char.exclude" />
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
@@ -55,7 +55,7 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="-test-module" depends="build, compile-tests, run-tests" />
+    <target name="-test-module" depends="build, compile-tests, prepare-exclude, run-tests" />
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/${hy.nio_char.packaging.jarname}.jar" />
@@ -146,6 +146,11 @@
         </javac>
     </target>
 
+    <target name="prepare-exclude">
+       <prepare-exclude-list moduleName="nio_char" dir="./make"
+                             result="${nio_char.exclude.file}"/>
+    </target>
+
     <target name="run-tests">
 
         <mkdir dir="${hy.tests.reports}" />
@@ -182,7 +187,7 @@
 
                 <fileset dir="${hy.nio_char.src.test.java}">
                     <include name="**/*Test.java"/>
-                    <excludesfile name="${exclude.file}" />
+                    <excludesfile name="${nio_char.exclude.file}" />
                 </fileset>
             </batchtest>
         </junit>

Added: harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.common
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.common?view=auto&rev=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.common (added)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.common Thu Jan 25 09:46:03 2007
@@ -0,0 +1,10 @@
+tests/api/java/nio/charset/ASCCharsetEncoderTest.java
+tests/api/java/nio/charset/CharsetProviderTest.java
+tests/api/java/nio/charset/ConcreteCharsetTest.java
+tests/api/java/nio/charset/GBCharsetEncoderTest.java
+tests/api/java/nio/charset/ISOCharsetEncoderTest.java
+tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java
+tests/api/java/nio/charset/UTF16CharsetDecoderTest.java
+tests/api/java/nio/charset/UTF16CharsetEncoderTest.java
+tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java
+tests/api/java/nio/charset/UTFCharsetEncoderTest.java

Propchange: harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.common
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86.drl?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86.drl Thu Jan 25 09:46:03 2007
@@ -1,10 +0,0 @@
-tests/api/java/nio/charset/ASCCharsetEncoderTest.java
-tests/api/java/nio/charset/CharsetProviderTest.java
-tests/api/java/nio/charset/ConcreteCharsetTest.java
-tests/api/java/nio/charset/GBCharsetEncoderTest.java
-tests/api/java/nio/charset/ISOCharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16CharsetDecoderTest.java
-tests/api/java/nio/charset/UTF16CharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java
-tests/api/java/nio/charset/UTFCharsetEncoderTest.java

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86.ibm?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86.ibm Thu Jan 25 09:46:03 2007
@@ -1,10 +0,0 @@
-tests/api/java/nio/charset/ASCCharsetEncoderTest.java
-tests/api/java/nio/charset/CharsetProviderTest.java
-tests/api/java/nio/charset/ConcreteCharsetTest.java
-tests/api/java/nio/charset/GBCharsetEncoderTest.java
-tests/api/java/nio/charset/ISOCharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16CharsetDecoderTest.java
-tests/api/java/nio/charset/UTF16CharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java
-tests/api/java/nio/charset/UTFCharsetEncoderTest.java

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86_64.drl?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86_64.drl Thu Jan 25 09:46:03 2007
@@ -1,10 +0,0 @@
-tests/api/java/nio/charset/ASCCharsetEncoderTest.java
-tests/api/java/nio/charset/CharsetProviderTest.java
-tests/api/java/nio/charset/ConcreteCharsetTest.java
-tests/api/java/nio/charset/GBCharsetEncoderTest.java
-tests/api/java/nio/charset/ISOCharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16CharsetDecoderTest.java
-tests/api/java/nio/charset/UTF16CharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java
-tests/api/java/nio/charset/UTFCharsetEncoderTest.java

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86_64.ibm?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86_64.ibm Thu Jan 25 09:46:03 2007
@@ -1,10 +0,0 @@
-tests/api/java/nio/charset/ASCCharsetEncoderTest.java
-tests/api/java/nio/charset/CharsetProviderTest.java
-tests/api/java/nio/charset/ConcreteCharsetTest.java
-tests/api/java/nio/charset/GBCharsetEncoderTest.java
-tests/api/java/nio/charset/ISOCharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16CharsetDecoderTest.java
-tests/api/java/nio/charset/UTF16CharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java
-tests/api/java/nio/charset/UTFCharsetEncoderTest.java

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.windows.x86.drl?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.windows.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.windows.x86.drl Thu Jan 25 09:46:03 2007
@@ -1,10 +0,0 @@
-tests/api/java/nio/charset/ASCCharsetEncoderTest.java
-tests/api/java/nio/charset/CharsetProviderTest.java
-tests/api/java/nio/charset/ConcreteCharsetTest.java
-tests/api/java/nio/charset/GBCharsetEncoderTest.java
-tests/api/java/nio/charset/ISOCharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16CharsetDecoderTest.java
-tests/api/java/nio/charset/UTF16CharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java
-tests/api/java/nio/charset/UTFCharsetEncoderTest.java

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.windows.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.windows.x86.ibm?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.windows.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.windows.x86.ibm Thu Jan 25 09:46:03 2007
@@ -1,10 +0,0 @@
-tests/api/java/nio/charset/ASCCharsetEncoderTest.java
-tests/api/java/nio/charset/CharsetProviderTest.java
-tests/api/java/nio/charset/ConcreteCharsetTest.java
-tests/api/java/nio/charset/GBCharsetEncoderTest.java
-tests/api/java/nio/charset/ISOCharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16CharsetDecoderTest.java
-tests/api/java/nio/charset/UTF16CharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java
-tests/api/java/nio/charset/UTFCharsetEncoderTest.java

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.windows.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.windows.x86_64.drl?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.windows.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.windows.x86_64.drl Thu Jan 25 09:46:03 2007
@@ -1,10 +0,0 @@
-tests/api/java/nio/charset/ASCCharsetEncoderTest.java
-tests/api/java/nio/charset/CharsetProviderTest.java
-tests/api/java/nio/charset/ConcreteCharsetTest.java
-tests/api/java/nio/charset/GBCharsetEncoderTest.java
-tests/api/java/nio/charset/ISOCharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16CharsetDecoderTest.java
-tests/api/java/nio/charset/UTF16CharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java
-tests/api/java/nio/charset/UTFCharsetEncoderTest.java

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.windows.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.windows.x86_64.ibm?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.windows.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.windows.x86_64.ibm Thu Jan 25 09:46:03 2007
@@ -1,10 +1 @@
-tests/api/java/nio/charset/ASCCharsetEncoderTest.java
-tests/api/java/nio/charset/CharsetProviderTest.java
-tests/api/java/nio/charset/ConcreteCharsetTest.java
-tests/api/java/nio/charset/GBCharsetEncoderTest.java
-tests/api/java/nio/charset/ISOCharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16CharsetDecoderTest.java
-tests/api/java/nio/charset/UTF16CharsetEncoderTest.java
-tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java
-tests/api/java/nio/charset/UTFCharsetEncoderTest.java
+

Modified: harmony/enhanced/classlib/trunk/modules/pack200/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/build.xml?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/build.xml Thu Jan 25 09:46:03 2007
@@ -38,8 +38,8 @@
     </fileset>
 
     <property file="../../make/depends.properties" />
-    <property name="exclude.file"
-              location="./make/exclude.${hy.platform}.${hy.test.vm.name}" />
+
+    <property name="pack200.exclude.file" location="${hy.hdk}/build/pack200.exclude" />
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
@@ -55,7 +55,7 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="-test-module" depends="build, compile-tests, run-tests" />
+    <target name="-test-module" depends="build, compile-tests, prepare-exclude, run-tests" />
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/pack200.jar" />
@@ -144,6 +144,11 @@
         </javac>
     </target>
 
+    <target name="prepare-exclude">
+       <prepare-exclude-list moduleName="pack200" dir="./make"
+                             result="${pack200.exclude.file}"/>
+    </target>
+
     <target name="run-tests">
 
         <mkdir dir="${hy.tests.reports}" />
@@ -180,7 +185,7 @@
 
                 <fileset dir="${hy.pack200.src.test.java}">
                     <include name="**/*Test.java"/>
-                    <excludesfile name="${exclude.file}" />
+                    <excludesfile name="${pack200.exclude.file}" />
                 </fileset>
             </batchtest>
         </junit>

Added: harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.common
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.common?view=auto&rev=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.common (added)
+++ harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.common Thu Jan 25 09:46:03 2007
@@ -0,0 +1 @@
+org/apache/harmony/pack200/tests/SegmentTest.java
\ No newline at end of file

Propchange: harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.common
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86.drl?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86.drl Thu Jan 25 09:46:03 2007
@@ -1 +0,0 @@
-org/apache/harmony/pack200/tests/SegmentTest.java
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86.ibm?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86.ibm Thu Jan 25 09:46:03 2007
@@ -1 +0,0 @@
-org/apache/harmony/pack200/tests/SegmentTest.java
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.drl?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.drl Thu Jan 25 09:46:03 2007
@@ -1 +0,0 @@
-org/apache/harmony/pack200/tests/SegmentTest.java
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.ibm?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.ibm Thu Jan 25 09:46:03 2007
@@ -1 +0,0 @@
-org/apache/harmony/pack200/tests/SegmentTest.java
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86.drl?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86.drl Thu Jan 25 09:46:03 2007
@@ -1 +0,0 @@
-org/apache/harmony/pack200/tests/SegmentTest.java
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86.ibm?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86.ibm Thu Jan 25 09:46:03 2007
@@ -1 +0,0 @@
-org/apache/harmony/pack200/tests/SegmentTest.java
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86_64.drl?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86_64.drl Thu Jan 25 09:46:03 2007
@@ -1 +0,0 @@
-org/apache/harmony/pack200/tests/SegmentTest.java
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86_64.ibm?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86_64.ibm Thu Jan 25 09:46:03 2007
@@ -1 +0,0 @@
-org/apache/harmony/pack200/tests/SegmentTest.java
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/build.xml Thu Jan 25 09:46:03 2007
@@ -39,7 +39,7 @@
         </or>
     </fileset>
 
-    <property name="exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}" />
+    <property name="prefs.exclude.file" location="${hy.hdk}/build/prefs.exclude" />
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
@@ -55,7 +55,7 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="-test-module" depends="build, compile-tests, run-tests" />
+    <target name="-test-module" depends="build, compile-tests, prepare-exclude, run-tests" />
 
     <!-- Build natives. Currently there are only windows natives for
      prefs, so we check if we are on a windows platform -->
@@ -166,6 +166,11 @@
         </javac>
     </target>
 
+    <target name="prepare-exclude">
+       <prepare-exclude-list moduleName="prefs" dir="./make"
+                             result="${prefs.exclude.file}"/>
+    </target>
+
     <target name="run-tests">
 
         <mkdir dir="${hy.tests.reports}" />
@@ -199,7 +204,7 @@
 
                 <fileset dir="${hy.prefs.src.test.java}">
                     <include name="**/*Test.java"/>
-                    <excludesfile name="${exclude.file}" />
+                    <excludesfile name="${prefs.exclude.file}" />
                 </fileset>
             </batchtest>
         </junit>

Added: harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.common
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.common?view=auto&rev=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.common (added)
+++ harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.common Thu Jan 25 09:46:03 2007
@@ -0,0 +1 @@
+org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java

Propchange: harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.common
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86.drl?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86.drl Thu Jan 25 09:46:03 2007
@@ -1 +0,0 @@
-org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java

Modified: harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86.ibm?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86.ibm Thu Jan 25 09:46:03 2007
@@ -1 +0,0 @@
-org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java

Modified: harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86_64.drl?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86_64.drl Thu Jan 25 09:46:03 2007
@@ -1 +0,0 @@
-org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java

Modified: harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86_64.ibm?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86_64.ibm Thu Jan 25 09:46:03 2007
@@ -1 +0,0 @@
-org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java

Modified: harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.windows.x86.drl?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.windows.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.windows.x86.drl Thu Jan 25 09:46:03 2007
@@ -1 +0,0 @@
-org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java

Modified: harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.windows.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.windows.x86.ibm?view=diff&rev=499868&r1=499867&r2=499868
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.windows.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.windows.x86.ibm Thu Jan 25 09:46:03 2007
@@ -1 +0,0 @@
-org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java



Mime
View raw message