harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r518038 - in /harmony/enhanced/jdktools/trunk: make/properties.xml modules/jpda/build.xml modules/jpda/make/exclude.common modules/jpda/make/exclude.windows.x86.drl modules/launcher/build.xml modules/samsa/build.xml modules/tools/build.xml
Date Wed, 14 Mar 2007 06:20:04 GMT
Author: smishura
Date: Tue Mar 13 23:20:02 2007
New Revision: 518038

URL: http://svn.apache.org/viewvc?view=rev&rev=518038
Log:
Apply slightly modified patch for HARMONY-3383:
([jdktools] support tests exclude lists in jdktools build scripts)

Added:
    harmony/enhanced/jdktools/trunk/modules/jpda/make/exclude.common   (with props)
    harmony/enhanced/jdktools/trunk/modules/jpda/make/exclude.windows.x86.drl   (with props)
Modified:
    harmony/enhanced/jdktools/trunk/make/properties.xml
    harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
    harmony/enhanced/jdktools/trunk/modules/launcher/build.xml
    harmony/enhanced/jdktools/trunk/modules/samsa/build.xml
    harmony/enhanced/jdktools/trunk/modules/tools/build.xml

Modified: harmony/enhanced/jdktools/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/properties.xml?view=diff&rev=518038&r1=518037&r2=518038
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/properties.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/properties.xml Tue Mar 13 23:20:02 2007
@@ -35,7 +35,7 @@
     <!-- Test run property -->
     <property name="hy.test.forkmode" value="perBatch" />
     <property name="hy.test.timeout" value="900000" />
-    <property name="hy.test.vm.name" value="ibm" />
+    <property name="hy.test.vm.name" value="drl" />
     <property name="hy.test.vmargs" value="" />
 
     <!-- Conditions for operating systems -->
@@ -161,6 +161,14 @@
     <property name="build.module" value="*" />
     <property name="exclude.module" value="nothing" />
 
+    <!-- names of exclude lists, used by prepare-exclude-list macro -->
+    <property name="common.exclude.file" value="exclude.common" />
+    <property name="common.exclude.interm" value="exclude.interm" />
+    <property name="platform.exclude.file"
+              value="exclude.${hy.platform}.${hy.test.vm.name}" />
+    <property name="platform.exclude.interm"
+              value="exclude.${hy.platform}.${hy.test.vm.name}.interm" />
+
     <target name="echo" depends="svn-prop, svn-info"
             description="Display the properties defined by this ant file" >
         <echo>
@@ -294,4 +302,26 @@
             </exec>
         </sequential>
     </macrodef>
+
+    <!-- Concatenate several exclude lists into single list -->
+    <macrodef name="prepare-exclude-list">
+       <attribute name="moduleName"/>
+       <!-- directory with exclude lists for the module -->
+       <attribute name="dir"/>
+       <!-- name of concatenated list, should be an absolute pathname -->
+       <attribute name="result"/>
+       <sequential>
+           <echo message="" file="@{result}"/>
+           <concat destfile="@{result}" force="yes" fixlastline="yes" append="true">
+               <fileset dir="@{dir}">
+                   <include name="${common.exclude.file}"/> 
+                   <include name="${platform.exclude.file}"/>
+                   <include name="${common.exclude.interm}" if="exclude.interm" />
+                   <include name="${platform.exclude.interm}" if="exclude.interm" />
+		   <size value="0" when="more"/>
+               </fileset>
+           </concat>
+       </sequential>
+   </macrodef>
+
 </project>

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/build.xml?view=diff&rev=518038&r1=518037&r2=518038
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/build.xml Tue Mar 13 23:20:02 2007
@@ -27,6 +27,9 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
     
+    <!-- filename for tests exclude list -->
+    <property name="jpda.exclude.file" location="${hy.hdk}/build/jdktools.jpda.exclude"
/>
+
     <property file="../../make/depends.properties" />
 
     <target name="build" depends="build-java, build-native" />
@@ -67,7 +70,7 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="test-module" depends="build-tests, run-tests" />
+    <target name="test-module" depends="build-tests, prepare-exclude, run-tests" />
 
     <!-- Clean Java -->
     <target name="clean-java"/>
@@ -101,7 +104,13 @@
         </javac>
     </target>
 
-    <target name="run-tests" depends="build-tests">
+    <target name="prepare-exclude">
+        <echo message="JPDA exclude list: ${jpda.exclude.file}" />
+        <prepare-exclude-list moduleName="jpda" dir="./make"
+                             result="${jpda.exclude.file}" />
+    </target>
+
+    <target name="run-tests" depends="build-tests, prepare-exclude">
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
         <property name="test.jre.jvm" value="${test.jre.home}/bin/java" />
@@ -146,6 +155,7 @@
                     <exclude name="**/org/apache/harmony/jpda/tests/jdwp/MultiSession/*Test.java"
/>
                     <exclude name="**/org/apache/harmony/jpda/tests/jdwp/ThreadReference/StopTest.java"
/>
                     <exclude name="**/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/HoldEventsTest.java"
/>
+                    <excludesfile name="${jpda.exclude.file}" />
                 </fileset>
             </batchtest>
 
@@ -155,6 +165,7 @@
                     <include name="**/org/apache/harmony/jpda/tests/jdwp/MultiSession/*Test.java"
/>
                     <include name="**/org/apache/harmony/jpda/tests/jdwp/ThreadReference/StopTest.java"
/>
                     <include name="**/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/HoldEventsTest.java"
/>
+                    <excludesfile name="${jpda.exclude.file}" />
                 </fileset>
             </batchtest>
         </junit>

Added: harmony/enhanced/jdktools/trunk/modules/jpda/make/exclude.common
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/make/exclude.common?view=auto&rev=518038
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/make/exclude.common (added)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/make/exclude.common Tue Mar 13 23:20:02 2007
@@ -0,0 +1,17 @@
+#3304
+org/apache/harmony/jpda/tests/jdwp/ClassType/InvokeMethodTest.java
+org/apache/harmony/jpda/tests/jdwp/ClassType/NewInstanceTest.java
+org/apache/harmony/jpda/tests/jdwp/ObjectReference/InvokeMethodTest.java
+#3305
+org/apache/harmony/jpda/tests/jdwp/VirtualMachine/CapabilitiesNewTest.java
+#3309
+org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionTest.java
+org/apache/harmony/jpda/tests/jdwp/MultiSession/EnableCollectionTest.java
+#3298
+org/apache/harmony/jpda/tests/jdwp/VirtualMachine/ClassPathsTest.java
+#3317
+org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues003Test.java
+#3340
+org/apache/harmony/jpda/tests/jdwp/ClassType/InvokeMethod002Test.java
+#3341
+org/apache/harmony/jpda/tests/jdwp/ThreadReference/StopTest.java

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

Added: harmony/enhanced/jdktools/trunk/modules/jpda/make/exclude.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/make/exclude.windows.x86.drl?view=auto&rev=518038
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/make/exclude.windows.x86.drl (added)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/make/exclude.windows.x86.drl Tue Mar 13 23:20:02
2007
@@ -0,0 +1,2 @@
+#3377 (Windows only)
+org/apache/harmony/jpda/tests/jdwp/MultiSession/ListenConnectorTest.java

Propchange: harmony/enhanced/jdktools/trunk/modules/jpda/make/exclude.windows.x86.drl
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/jdktools/trunk/modules/launcher/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/launcher/build.xml?view=diff&rev=518038&r1=518037&r2=518038
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/launcher/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/launcher/build.xml Tue Mar 13 23:20:02 2007
@@ -28,6 +28,9 @@
 
     <property file="../../make/depends.properties" />
 
+    <!-- filename for tests exclude list -->
+    <property name="launcher.exclude.file" location="${hy.hdk}/build/jdktools.launcher.exclude"
/>
+
     <target name="build" depends="build-native"/>
     <target name="build-java"/>
 
@@ -36,7 +39,7 @@
 
     <target name="test" depends="test-module" />
     <target name="build-tests" />
-    <target name="test-module" depends="run-tests" />
+    <target name="test-module" depends="prepare-exclude, run-tests" />
 
     <target name="build-native" >
 
@@ -60,7 +63,13 @@
 
       </target>
 
-      <target name="run-tests" >
+    <target name="prepare-exclude">
+        <echo message="LAUNCER exclude list: ${launcher.exclude.file}" />
+        <prepare-exclude-list moduleName="launcher" dir="./make"
+                             result="${launcher.exclude.file}" />
+    </target>
+
+      <target name="run-tests" depends="prepare-exclude" >
 
           <property name="test.jre.home" value="${hy.jdk}/jre" />
 

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/build.xml?view=diff&rev=518038&r1=518037&r2=518038
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/build.xml Tue Mar 13 23:20:02 2007
@@ -28,6 +28,9 @@
 
     <property file="../../make/depends.properties" />
 
+    <!-- filename for tests exclude list -->
+    <property name="samsa.exclude.file" location="${hy.hdk}/build/jdktools.samsa.exclude"
/>
+
     <target name="build" depends="build-native"/>
     <target name="build-java"/>
 
@@ -36,7 +39,7 @@
 
     <target name="test" depends="test-module" />
     <target name="build-tests" />
-    <target name="test-module" depends="run-tests" />
+    <target name="test-module" depends="prepare-exclude, run-tests" />
 
     <target name="build-native" >
 
@@ -79,7 +82,13 @@
 
     </target>
 
-    <target name="run-tests" >
+    <target name="prepare-exclude">
+        <echo message="SAMSA exclude list: ${samsa.exclude.file}" />
+        <prepare-exclude-list moduleName="samsa" dir="./make"
+                             result="${samsa.exclude.file}" />
+    </target>
+
+    <target name="run-tests" depends="prepare-exclude" >
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 

Modified: harmony/enhanced/jdktools/trunk/modules/tools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/tools/build.xml?view=diff&rev=518038&r1=518037&r2=518038
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/tools/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/tools/build.xml Tue Mar 13 23:20:02 2007
@@ -28,6 +28,9 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <!-- filename for tests exclude list -->
+    <property name="tools.exclude.file" location="${hy.hdk}/build/jdktools.tools.exclude"
/>
+
     <fileset id="classes" dir="${hy.build}">
         <or>
             <present targetdir="${hy.tools.src.main.java}" />
@@ -58,7 +61,7 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="test-module" depends="build-tests, run-tests" />
+    <target name="test-module" depends="build-tests, prepare-exclude, run-tests" />
 
     <target name="clean-java">
         <echo message="Cleaning TOOLS classes" />
@@ -162,7 +165,13 @@
         </javac>
     </target>
 
-    <target name="run-tests" depends="build-tests">
+    <target name="prepare-exclude">
+        <echo message="TOOLS exclude list: ${tools.exclude.file}" />
+        <prepare-exclude-list moduleName="tools" dir="./make"
+                             result="${tools.exclude.file}" />
+    </target>
+
+    <target name="run-tests" depends="build-tests, prepare-exclude">
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
@@ -198,6 +207,7 @@
 
                 <fileset dir="${hy.tools.src.test.java}">
                     <include name="**/*Test.java"/>
+                    <excludesfile name="${tools.exclude.file}" />
                 </fileset>
             </batchtest>
         </junit>



Mime
View raw message