svn commit: r496741 - /harmony/enhanced/classlib/trunk/modules/jndi/build.xml

[ay...@apache.org]

Author: ayza
Date: Tue Jan 16 08:04:55 2007
New Revision: 496741

URL: http://svn.apache.org/viewvc?view=rev&rev=496741
Log:
Add support for common exclude lists for the JNDI module (HARMONY-2970)

Modified:
    harmony/enhanced/classlib/trunk/modules/jndi/build.xml

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=496741&r1=496740&r2=496741
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/build.xml Tue Jan 16 08:04:55 2007
@@ -37,6 +37,12 @@
         </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" />
+
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
     <target name="test" depends="-test-module">
@@ -51,7 +57,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/jndi.jar" />
@@ -141,6 +147,28 @@
         </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>
+
     <target name="run-tests">
 
         <mkdir dir="${hy.tests.reports}" />
@@ -174,6 +202,8 @@
 
                 <fileset dir="${hy.jndi.src.test.java}">
                     <include name="**/*Test.java"/>
+                    <excludesfile name="${exclude.file}" />
+
                     <!--  These tests run in a separate jvm below -->
                     <exclude name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerBuilderTest.java" />
                     <exclude name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerTest.java" />
@@ -184,25 +214,25 @@
             <batchtest todir="${hy.tests.reports}" haltonfailure="no"
                    unless="test.case">
             
-            <fileset dir="${hy.jndi.src.test.java}">
-                <include name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerTest.java" />
-            </fileset>
+                <fileset dir="${hy.jndi.src.test.java}">
+                    <include name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerTest.java" />
+                </fileset>
             </batchtest>
             
             <batchtest todir="${hy.tests.reports}" haltonfailure="no"
                    unless="test.case">
             
-            <fileset dir="${hy.jndi.src.test.java}">
-                <include name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerBuilderTest.java" />
-            </fileset>
+                <fileset dir="${hy.jndi.src.test.java}">
+                    <include name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerBuilderTest.java" />
+                </fileset>
             </batchtest>            
             
             <batchtest todir="${hy.tests.reports}" haltonfailure="no"
                    unless="test.case">
             
-            <fileset dir="${hy.jndi.src.test.java}">
-                <include name="org/apache/harmony/jndi/tests/javax/naming/spi/DirectoryManagerTest.java" />
-            </fileset>
+                <fileset dir="${hy.jndi.src.test.java}">
+                    <include name="org/apache/harmony/jndi/tests/javax/naming/spi/DirectoryManagerTest.java" />
+                </fileset>
             </batchtest>            
             
         </junit>