You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ay...@apache.org on 2007/01/15 19:37:20 UTC
svn commit: r496428 - in /harmony/enhanced/classlib/trunk/modules/beans: ./
make/
Author: ayza
Date: Mon Jan 15 10:37:19 2007
New Revision: 496428
URL: http://svn.apache.org/viewvc?view=rev&rev=496428
Log:
Add support for common exclude list (HARMONY-2970): BEANS
Added:
harmony/enhanced/classlib/trunk/modules/beans/make/exclude.common (with props)
Modified:
harmony/enhanced/classlib/trunk/modules/beans/build.xml
harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86.drl
harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86.ibm
harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86_64.drl
harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86_64.ibm
harmony/enhanced/classlib/trunk/modules/beans/make/exclude.windows.x86.drl
harmony/enhanced/classlib/trunk/modules/beans/make/exclude.windows.x86.ibm
harmony/enhanced/classlib/trunk/modules/beans/make/exclude.windows.x86_64.drl
harmony/enhanced/classlib/trunk/modules/beans/make/exclude.windows.x86_64.ibm
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=496428&r1=496427&r2=496428
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/build.xml Mon Jan 15 10:37:19 2007
@@ -38,7 +38,12 @@
</fileset>
<property file="../../make/depends.properties" />
- <property name="exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}" />
+
+ <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" />
<target name="build" depends="compile-java, copy-resources, build-jar" />
@@ -54,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/beans.jar" />
@@ -187,6 +192,28 @@
<classpath location="${hy.beans.bin.test.support}" />
<classpath location="${hy.hdk}/build/test/support.jar" />
</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>
<target name="run-tests">
Added: harmony/enhanced/classlib/trunk/modules/beans/make/exclude.common
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/make/exclude.common?view=auto&rev=496428
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/make/exclude.common (added)
+++ harmony/enhanced/classlib/trunk/modules/beans/make/exclude.common Mon Jan 15 10:37:19 2007
@@ -0,0 +1,13 @@
+org/apache/harmony/beans/tests/java/beans/EncoderTest.java
+org/apache/harmony/beans/tests/java/beans/PropertyChangeSupportTest.java
+org/apache/harmony/beans/tests/java/beans/PropertyEditorManagerTest.java
+org/apache/harmony/beans/tests/java/beans/VetoableChangeListenerProxyTest.java
+org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java
+org/apache/harmony/beans/tests/java/beans/XMLDecoderTest.java
+org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java
+org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextChildSupportTest.java
+org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextMembershipEventTest.java
+org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceAvailableEventTest.java
+org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java
+org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java
+org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java
Propchange: harmony/enhanced/classlib/trunk/modules/beans/make/exclude.common
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86.drl?view=diff&rev=496428&r1=496427&r2=496428
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86.drl Mon Jan 15 10:37:19 2007
@@ -1,13 +0,0 @@
-org/apache/harmony/beans/tests/java/beans/EncoderTest.java
-org/apache/harmony/beans/tests/java/beans/PropertyChangeSupportTest.java
-org/apache/harmony/beans/tests/java/beans/PropertyEditorManagerTest.java
-org/apache/harmony/beans/tests/java/beans/VetoableChangeListenerProxyTest.java
-org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java
-org/apache/harmony/beans/tests/java/beans/XMLDecoderTest.java
-org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextChildSupportTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextMembershipEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceAvailableEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java
Modified: harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86.ibm?view=diff&rev=496428&r1=496427&r2=496428
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86.ibm Mon Jan 15 10:37:19 2007
@@ -1,13 +0,0 @@
-org/apache/harmony/beans/tests/java/beans/EncoderTest.java
-org/apache/harmony/beans/tests/java/beans/PropertyChangeSupportTest.java
-org/apache/harmony/beans/tests/java/beans/PropertyEditorManagerTest.java
-org/apache/harmony/beans/tests/java/beans/VetoableChangeListenerProxyTest.java
-org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java
-org/apache/harmony/beans/tests/java/beans/XMLDecoderTest.java
-org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextChildSupportTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextMembershipEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceAvailableEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java
Modified: harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86_64.drl?view=diff&rev=496428&r1=496427&r2=496428
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86_64.drl Mon Jan 15 10:37:19 2007
@@ -1,16 +1,3 @@
-org/apache/harmony/beans/tests/java/beans/EncoderTest.java
-org/apache/harmony/beans/tests/java/beans/PropertyChangeSupportTest.java
-org/apache/harmony/beans/tests/java/beans/PropertyEditorManagerTest.java
-org/apache/harmony/beans/tests/java/beans/VetoableChangeListenerProxyTest.java
-org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java
-org/apache/harmony/beans/tests/java/beans/XMLDecoderTest.java
-org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextChildSupportTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextMembershipEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceAvailableEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java
org/apache/harmony/beans/tests/java/beans/EventHandlerTest.java
org/apache/harmony/beans/tests/java/beans/PersistenceDelegateTest.java
Modified: harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86_64.ibm?view=diff&rev=496428&r1=496427&r2=496428
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86_64.ibm Mon Jan 15 10:37:19 2007
@@ -1,13 +0,0 @@
-org/apache/harmony/beans/tests/java/beans/EncoderTest.java
-org/apache/harmony/beans/tests/java/beans/PropertyChangeSupportTest.java
-org/apache/harmony/beans/tests/java/beans/PropertyEditorManagerTest.java
-org/apache/harmony/beans/tests/java/beans/VetoableChangeListenerProxyTest.java
-org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java
-org/apache/harmony/beans/tests/java/beans/XMLDecoderTest.java
-org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextChildSupportTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextMembershipEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceAvailableEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java
Modified: harmony/enhanced/classlib/trunk/modules/beans/make/exclude.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/make/exclude.windows.x86.drl?view=diff&rev=496428&r1=496427&r2=496428
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/make/exclude.windows.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/make/exclude.windows.x86.drl Mon Jan 15 10:37:19 2007
@@ -1,13 +0,0 @@
-org/apache/harmony/beans/tests/java/beans/EncoderTest.java
-org/apache/harmony/beans/tests/java/beans/PropertyChangeSupportTest.java
-org/apache/harmony/beans/tests/java/beans/PropertyEditorManagerTest.java
-org/apache/harmony/beans/tests/java/beans/VetoableChangeListenerProxyTest.java
-org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java
-org/apache/harmony/beans/tests/java/beans/XMLDecoderTest.java
-org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextChildSupportTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextMembershipEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceAvailableEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java
Modified: harmony/enhanced/classlib/trunk/modules/beans/make/exclude.windows.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/make/exclude.windows.x86.ibm?view=diff&rev=496428&r1=496427&r2=496428
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/make/exclude.windows.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/make/exclude.windows.x86.ibm Mon Jan 15 10:37:19 2007
@@ -1,13 +0,0 @@
-org/apache/harmony/beans/tests/java/beans/EncoderTest.java
-org/apache/harmony/beans/tests/java/beans/PropertyChangeSupportTest.java
-org/apache/harmony/beans/tests/java/beans/PropertyEditorManagerTest.java
-org/apache/harmony/beans/tests/java/beans/VetoableChangeListenerProxyTest.java
-org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java
-org/apache/harmony/beans/tests/java/beans/XMLDecoderTest.java
-org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextChildSupportTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextMembershipEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceAvailableEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java
Modified: harmony/enhanced/classlib/trunk/modules/beans/make/exclude.windows.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/make/exclude.windows.x86_64.drl?view=diff&rev=496428&r1=496427&r2=496428
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/make/exclude.windows.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/make/exclude.windows.x86_64.drl Mon Jan 15 10:37:19 2007
@@ -1,13 +0,0 @@
-org/apache/harmony/beans/tests/java/beans/EncoderTest.java
-org/apache/harmony/beans/tests/java/beans/PropertyChangeSupportTest.java
-org/apache/harmony/beans/tests/java/beans/PropertyEditorManagerTest.java
-org/apache/harmony/beans/tests/java/beans/VetoableChangeListenerProxyTest.java
-org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java
-org/apache/harmony/beans/tests/java/beans/XMLDecoderTest.java
-org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextChildSupportTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextMembershipEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceAvailableEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java
Modified: harmony/enhanced/classlib/trunk/modules/beans/make/exclude.windows.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/make/exclude.windows.x86_64.ibm?view=diff&rev=496428&r1=496427&r2=496428
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/make/exclude.windows.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/make/exclude.windows.x86_64.ibm Mon Jan 15 10:37:19 2007
@@ -1,13 +0,0 @@
-org/apache/harmony/beans/tests/java/beans/EncoderTest.java
-org/apache/harmony/beans/tests/java/beans/PropertyChangeSupportTest.java
-org/apache/harmony/beans/tests/java/beans/PropertyEditorManagerTest.java
-org/apache/harmony/beans/tests/java/beans/VetoableChangeListenerProxyTest.java
-org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java
-org/apache/harmony/beans/tests/java/beans/XMLDecoderTest.java
-org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextChildSupportTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextMembershipEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceAvailableEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java
-org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java