harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r496752 - in /harmony/enhanced/classlib/trunk/modules: logging/ luni/ luni/make/ math/ misc/
Date Tue, 16 Jan 2007 16:42:06 GMT
Author: ayza
Date: Tue Jan 16 08:42:05 2007
New Revision: 496752

URL: http://svn.apache.org/viewvc?view=rev&rev=496752
Log:
Add common exclude list support for LOGGING, LUNI, MATH and MISC modules (HARMONY-2970)

Added:
    harmony/enhanced/classlib/trunk/modules/luni/make/exclude.common   (with props)
Modified:
    harmony/enhanced/classlib/trunk/modules/logging/build.xml
    harmony/enhanced/classlib/trunk/modules/luni/build.xml
    harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86.drl
    harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86.ibm
    harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86.drl
    harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86.ibm
    harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/math/build.xml
    harmony/enhanced/classlib/trunk/modules/misc/build.xml

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=496752&r1=496751&r2=496752
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/logging/build.xml Tue Jan 16 08:42:05 2007
@@ -37,6 +37,12 @@
         </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" />
+
     <target name="build" depends="compile-java, copy-jar-resources, build-jar, copy-resources"
/>
 
     <target name="test" depends="-test-module">
@@ -51,7 +57,29 @@
     </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="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" />
@@ -202,6 +230,8 @@
 
                 <fileset dir="${hy.logging.src.test.java}">
                     <include name="org/apache/harmony/logging/tests/java/util/logging/*Test.java"/>
+                    <excludesfile name="${exclude.file}" />
+
                     <exclude name="org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java"
/>
                 </fileset>
             </batchtest>

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=496752&r1=496751&r2=496752
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Tue Jan 16 08:42:05 2007
@@ -39,7 +39,12 @@
 
     <property file="../../make/depends.properties" />
     <property name="fdlibm.zip" location="${depends.oss}/fdlibm_5.2.zip" />
-    <property name="exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}"
/>
+
+    <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" />
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
@@ -176,7 +181,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/luni.jar" />
@@ -266,6 +271,28 @@
                 <include name="**/*.java" />
             </javac-elements>
         </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>
 
     <target name="run-tests">

Added: harmony/enhanced/classlib/trunk/modules/luni/make/exclude.common
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/exclude.common?view=auto&rev=496752
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/exclude.common (added)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/exclude.common Tue Jan 16 08:42:05 2007
@@ -0,0 +1,9 @@
+tests/api/java/io/OutputStreamWriterTest.java
+tests/api/java/lang/ProcessTest.java
+tests/api/java/net/HttpURLConnectionTest.java
+tests/api/java/net/MulticastSocketTest.java
+tests/api/java/net/SocketImplTest.java
+tests/api/java/net/URLClassLoaderTest.java
+tests/api/java/net/URLConnectionTest.java
+tests/api/java/net/URLTest.java
+tests/api/java/net/SocketPermissionTest.java

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

Modified: harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86.drl?view=diff&rev=496752&r1=496751&r2=496752
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86.drl Tue Jan 16 08:42:05
2007
@@ -1,12 +1,3 @@
 org/apache/harmony/luni/tests/java/lang/ThreadTest.java
 org/apache/harmony/tests/internal/net/www/protocol/http/HttpURLConnectionTest.java
-tests/api/java/io/OutputStreamWriterTest.java
-tests/api/java/lang/ProcessTest.java
-tests/api/java/net/HttpURLConnectionTest.java
-tests/api/java/net/MulticastSocketTest.java
-tests/api/java/net/SocketImplTest.java
 tests/api/java/net/SocketTest.java
-tests/api/java/net/URLClassLoaderTest.java
-tests/api/java/net/URLConnectionTest.java
-tests/api/java/net/URLTest.java
-tests/api/java/net/SocketPermissionTest.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86.ibm?view=diff&rev=496752&r1=496751&r2=496752
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86.ibm Tue Jan 16 08:42:05
2007
@@ -1,11 +1,2 @@
 org/apache/harmony/tests/internal/net/www/protocol/http/HttpURLConnectionTest.java
-tests/api/java/io/OutputStreamWriterTest.java
-tests/api/java/lang/ProcessTest.java
-tests/api/java/net/HttpURLConnectionTest.java
-tests/api/java/net/MulticastSocketTest.java
-tests/api/java/net/SocketImplTest.java
 tests/api/java/net/SocketTest.java
-tests/api/java/net/URLClassLoaderTest.java
-tests/api/java/net/URLConnectionTest.java
-tests/api/java/net/URLTest.java
-tests/api/java/net/SocketPermissionTest.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.drl?view=diff&rev=496752&r1=496751&r2=496752
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.drl Tue Jan 16
08:42:05 2007
@@ -1,13 +1,4 @@
+org/apache/harmony/luni/tests/java/net/InetAddressTest.java
 org/apache/harmony/luni/tests/java/lang/ThreadTest.java
 org/apache/harmony/tests/internal/net/www/protocol/http/HttpURLConnectionTest.java
-tests/api/java/io/OutputStreamWriterTest.java
-tests/api/java/lang/ProcessTest.java
-tests/api/java/net/HttpURLConnectionTest.java
-tests/api/java/net/MulticastSocketTest.java
-tests/api/java/net/SocketImplTest.java
 tests/api/java/net/SocketTest.java
-tests/api/java/net/URLClassLoaderTest.java
-tests/api/java/net/URLConnectionTest.java
-tests/api/java/net/URLTest.java
-tests/api/java/net/SocketPermissionTest.java
-org/apache/harmony/luni/tests/java/net/InetAddressTest.java
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.ibm?view=diff&rev=496752&r1=496751&r2=496752
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.ibm Tue Jan 16
08:42:05 2007
@@ -1,10 +1 @@
-tests/api/java/io/OutputStreamWriterTest.java
-tests/api/java/lang/ProcessTest.java
-tests/api/java/net/HttpURLConnectionTest.java
-tests/api/java/net/MulticastSocketTest.java
-tests/api/java/net/SocketImplTest.java
 tests/api/java/net/SocketTest.java
-tests/api/java/net/URLClassLoaderTest.java
-tests/api/java/net/URLConnectionTest.java
-tests/api/java/net/URLTest.java
-tests/api/java/net/SocketPermissionTest.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86.drl?view=diff&rev=496752&r1=496751&r2=496752
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86.drl Tue Jan 16 08:42:05
2007
@@ -1,9 +0,0 @@
-tests/api/java/io/OutputStreamWriterTest.java
-tests/api/java/lang/ProcessTest.java
-tests/api/java/net/HttpURLConnectionTest.java
-tests/api/java/net/MulticastSocketTest.java
-tests/api/java/net/SocketImplTest.java
-tests/api/java/net/URLClassLoaderTest.java
-tests/api/java/net/URLConnectionTest.java
-tests/api/java/net/URLTest.java
-tests/api/java/net/SocketPermissionTest.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86.ibm?view=diff&rev=496752&r1=496751&r2=496752
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86.ibm Tue Jan 16 08:42:05
2007
@@ -1,9 +0,0 @@
-tests/api/java/io/OutputStreamWriterTest.java
-tests/api/java/lang/ProcessTest.java
-tests/api/java/net/HttpURLConnectionTest.java
-tests/api/java/net/MulticastSocketTest.java
-tests/api/java/net/SocketImplTest.java
-tests/api/java/net/URLClassLoaderTest.java
-tests/api/java/net/URLConnectionTest.java
-tests/api/java/net/URLTest.java
-tests/api/java/net/SocketPermissionTest.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86_64.drl?view=diff&rev=496752&r1=496751&r2=496752
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86_64.drl Tue Jan 16
08:42:05 2007
@@ -1,9 +0,0 @@
-tests/api/java/io/OutputStreamWriterTest.java
-tests/api/java/lang/ProcessTest.java
-tests/api/java/net/HttpURLConnectionTest.java
-tests/api/java/net/MulticastSocketTest.java
-tests/api/java/net/SocketImplTest.java
-tests/api/java/net/URLClassLoaderTest.java
-tests/api/java/net/URLConnectionTest.java
-tests/api/java/net/URLTest.java
-tests/api/java/net/SocketPermissionTest.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86_64.ibm?view=diff&rev=496752&r1=496751&r2=496752
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86_64.ibm Tue Jan 16
08:42:05 2007
@@ -1,9 +0,0 @@
-tests/api/java/io/OutputStreamWriterTest.java
-tests/api/java/lang/ProcessTest.java
-tests/api/java/net/HttpURLConnectionTest.java
-tests/api/java/net/MulticastSocketTest.java
-tests/api/java/net/SocketImplTest.java
-tests/api/java/net/URLClassLoaderTest.java
-tests/api/java/net/URLConnectionTest.java
-tests/api/java/net/URLTest.java
-tests/api/java/net/SocketPermissionTest.java

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=496752&r1=496751&r2=496752
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/math/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/math/build.xml Tue Jan 16 08:42:05 2007
@@ -37,6 +37,12 @@
         </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" />
+
     <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/math.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="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>
+
     <target name="run-tests">
 
         <mkdir dir="${hy.tests.reports}" />
@@ -173,6 +201,7 @@
 
                 <fileset dir="${hy.math.src.test.java}">
                     <include name="**/*Test.java" />
+                    <excludesfile name="${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=496752&r1=496751&r2=496752
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/build.xml Tue Jan 16 08:42:05 2007
@@ -39,6 +39,12 @@
 
     <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" />
+
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
     <target name="test" depends="-test-module">
@@ -53,7 +59,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.misc.packaging.jarname}.jar" />
@@ -160,6 +166,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="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>
+
     <target name="run-tests">
         <mkdir dir="${hy.tests.reports}" />
 
@@ -191,6 +219,7 @@
 
                 <fileset dir="${hy.misc.src.test.java}">
                     <include name="**/*Test.java" />
+                    <excludesfile name="${exclude.file}" />
                 </fileset>
             </batchtest>
         </junit>



Mime
View raw message