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/16 16:48:13 UTC
svn commit: r496735 - in
/harmony/enhanced/classlib/trunk/modules/instrument: ./ make/
Author: ayza
Date: Tue Jan 16 07:48:12 2007
New Revision: 496735
URL: http://svn.apache.org/viewvc?view=rev&rev=496735
Log:
Add support for common exclude lists for the INSTRUMENT module (HARMONY-2970)
Added:
harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.common (with props)
Modified:
harmony/enhanced/classlib/trunk/modules/instrument/build.xml
harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86.drl
harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86.ibm
harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86_64.drl
harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86_64.ibm
harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.windows.x86.drl
harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.windows.x86.ibm
harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.windows.x86_64.drl
harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.windows.x86_64.ibm
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=496735&r1=496734&r2=496735
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/build.xml Tue Jan 16 07:48:12 2007
@@ -38,7 +38,12 @@
</fileset>
<property name="iculib.zip" location="${depends.oss}/icu4c-3.4-harmony.zip" />
- <property name="exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}" />
+
+ <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" />
<target name="build" depends="compile-java, copy-resources, build-jar" />
@@ -54,8 +59,8 @@
</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="overlay-oss">
<mkdir dir="${hy.instrument.src.main.native}/icu4c/unicode" />
<unzip src="${iculib.zip}" dest="${hy.instrument.src.main.native}/icu4c/unicode" />
@@ -171,6 +176,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="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>
+
<target name="run-tests">
<mkdir dir="${hy.tests.reports}" />
Added: harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.common
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.common?view=auto&rev=496735
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.common (added)
+++ harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.common Tue Jan 16 07:48:12 2007
@@ -0,0 +1 @@
+org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java
Propchange: harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.common
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86.drl?view=diff&rev=496735&r1=496734&r2=496735
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86.drl Tue Jan 16 07:48:12 2007
@@ -1 +0,0 @@
-org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java
Modified: harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86.ibm?view=diff&rev=496735&r1=496734&r2=496735
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86.ibm Tue Jan 16 07:48:12 2007
@@ -1 +0,0 @@
-org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java
Modified: harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86_64.drl?view=diff&rev=496735&r1=496734&r2=496735
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86_64.drl Tue Jan 16 07:48:12 2007
@@ -1 +0,0 @@
-org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java
Modified: harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86_64.ibm?view=diff&rev=496735&r1=496734&r2=496735
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86_64.ibm Tue Jan 16 07:48:12 2007
@@ -1 +0,0 @@
-org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java
Modified: harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.windows.x86.drl?view=diff&rev=496735&r1=496734&r2=496735
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.windows.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.windows.x86.drl Tue Jan 16 07:48:12 2007
@@ -1 +0,0 @@
-org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java
Modified: harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.windows.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.windows.x86.ibm?view=diff&rev=496735&r1=496734&r2=496735
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.windows.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.windows.x86.ibm Tue Jan 16 07:48:12 2007
@@ -1 +0,0 @@
-org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java
Modified: harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.windows.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.windows.x86_64.drl?view=diff&rev=496735&r1=496734&r2=496735
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.windows.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.windows.x86_64.drl Tue Jan 16 07:48:12 2007
@@ -1 +0,0 @@
-org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java
Modified: harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.windows.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.windows.x86_64.ibm?view=diff&rev=496735&r1=496734&r2=496735
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.windows.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.windows.x86_64.ibm Tue Jan 16 07:48:12 2007
@@ -1 +0,0 @@
-org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java