harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r477741 - in /harmony/enhanced/drlvm/trunk/build/make: ./ excludes/ targets/
Date Tue, 21 Nov 2006 16:51:52 GMT
Author: geirm
Date: Tue Nov 21 08:51:52 2006
New Revision: 477741

URL: http://svn.apache.org/viewvc?view=rev&rev=477741
Log:
Adding formal, platform specific exclusion lists for the kernel tests
(hey, it's a start).

As part of this, I "reach over" and use the classlib properties.xml
so that the defined platform, arch and vm terms are the same
as used in classlib.  These are different than the set used 
in DRLVM, but we have to converge somehow.

The excludes initially seeded are the ones that were buried in the 
kernel.test.xml file, which are now not used


Added:
    harmony/enhanced/drlvm/trunk/build/make/excludes/
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.drl
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86_64.drl
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.drl
Modified:
    harmony/enhanced/drlvm/trunk/build/make/build.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml
    harmony/enhanced/drlvm/trunk/build/make/test.properties

Modified: harmony/enhanced/drlvm/trunk/build/make/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/build.xml?view=diff&rev=477741&r1=477740&r2=477741
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build.xml Tue Nov 21 08:51:52 2006
@@ -61,16 +61,21 @@
     <!-- flag and location for final 'copy to build/deploy directory' step -->
     <!-- <property name="deploy.canonical.flag" value="false"/> -->
     <property name="canonical.deploy.dir" location="../deploy" />
+
+    <property name="hy.test.vm.name" value="drl"/>
     
+    <!-- set the path root for the classlib : must be relative to the build directory
-->
+    <property name="external.dep.CLASSLIB.loc" value="../../../working_classlib" />
+
+    <property name="external.dep.CLASSLIB" location="${external.dep.CLASSLIB.loc}" />
+
+    <import file="${external.dep.CLASSLIB}/make/properties.xml"/>
+
     <!-- ===============================================================
         Define locations of external dependencies
       ================================================================== -->
     <target name="extern_dep">
 
-        <!-- set the path root for the classlib : must be relative to the build directory
-->
-        <property name="external.dep.CLASSLIB.loc" value="../../../working_classlib" />
-
-        <property name="external.dep.CLASSLIB" location="${external.dep.CLASSLIB.loc}"
/>
 
         <echo> Using CLASSLIB = ${external.dep.CLASSLIB}</echo>
 
@@ -78,6 +83,7 @@
         <property name="external.dep.CLASSLIB.includes" value="${external.dep.CLASSLIB}/deploy/include"
/>
         <property name="external.dep.CLASSLIB.libdir" value="${external.dep.CLASSLIB}/deploy/lib"
/>
         <property name="external.dep.CLASSLIB.jardir" value="${external.dep.CLASSLIB}/deploy/jdk/jre/lib/boot"/>
+        
     </target>
 
     <target name="detect.os.arch.cxx.cfg">

Added: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.drl?view=auto&rev=477741
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.drl (added)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.drl Tue
Nov 21 08:51:52 2006
@@ -0,0 +1,11 @@
+## These tests are too slow
+java/lang/RuntimeAdditionalTest*.java
+
+## Tese tests are unstable and hang often
+java/lang/RuntimeAdditionalTest11.java
+java/lang/RuntimeAdditionalTest34.java
+java/lang/RuntimeAdditionalTest39.java
+java/lang/RuntimeAdditionalTest40.java
+java/lang/RuntimeAdditionalTest41.java
+java/lang/RuntimeAdditionalTest42.java
+

Added: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86_64.drl?view=auto&rev=477741
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86_64.drl
(added)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86_64.drl
Tue Nov 21 08:51:52 2006
@@ -0,0 +1,11 @@
+## These tests are too slow
+java/lang/RuntimeAdditionalTest*.java
+
+## Tese tests are unstable and hang often
+java/lang/RuntimeAdditionalTest11.java
+java/lang/RuntimeAdditionalTest34.java
+java/lang/RuntimeAdditionalTest39.java
+java/lang/RuntimeAdditionalTest40.java
+java/lang/RuntimeAdditionalTest41.java
+java/lang/RuntimeAdditionalTest42.java
+

Added: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.drl?view=auto&rev=477741
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.drl
(added)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.drl
Tue Nov 21 08:51:52 2006
@@ -0,0 +1,11 @@
+## These tests are too slow
+java/lang/RuntimeAdditionalTest*.java
+
+## Tese tests are unstable and hang often
+java/lang/RuntimeAdditionalTest11.java
+java/lang/RuntimeAdditionalTest34.java
+java/lang/RuntimeAdditionalTest39.java
+java/lang/RuntimeAdditionalTest40.java
+java/lang/RuntimeAdditionalTest41.java
+java/lang/RuntimeAdditionalTest42.java
+

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml?view=diff&rev=477741&r1=477740&r2=477741
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml Tue Nov 21 08:51:52 2006
@@ -25,14 +25,17 @@
     <property name="test.jvm.exe" value="${build.deploy.dir}/bin/java"/>
     <property file="test.properties"/>
 
+    <property name="exclude.file" location="./excludes/exclude.drlvm_kernel.${hy.platform}.${hy.test.vm.name}"
/>
+
+    <!-- no longer used - leaving here temporarily to be sure people like the change
     <patternset id="kernel.test.java.pattern">
         <include name="org/apache/harmony/**/*Test.java" />
         <include name="java/lang/**/*Test*.java" />
 
-        <!-- These tests are too slow -->
+        **These tests are too slow **
         <exclude name="java/lang/RuntimeAdditionalTest*.java" />
 
-        <!-- These tests are unstable and hang often -->
+        ** These tests are unstable and hang often **
         <exclude name="java/lang/RuntimeAdditionalTest11.java" />
         <exclude name="java/lang/RuntimeAdditionalTest34.java" />
         <exclude name="java/lang/RuntimeAdditionalTest39.java" />
@@ -40,6 +43,7 @@
         <exclude name="java/lang/RuntimeAdditionalTest41.java" />
         <exclude name="java/lang/RuntimeAdditionalTest42.java" />
     </patternset>
+    -->
     
     <target name="kernel.test" 
         depends="compile-kernel-test, run-kernel-test, report-kernel-test, check-kernel-test"/>
@@ -125,11 +129,19 @@
     <target name="-run-kernel-test-batch">
         <propertycopy property="kernel.mode.name" from="${kernel.mode}.name" override="on"/>
      
         <propertycopy property="kernel.mode.switch" from="${kernel.mode}.switch" override="on"/>
+
+        <loadfile property="foo" srcFile="${exclude.file}"/>
+
         <echo>
         ==================================
         Run kernel tests using ${kernel.mode.name}
         ==================================
+ 
+Using exclude file = ${exclude.file}
+        
+${foo}
         </echo>
+        
         <property name="report.dir"
             location="${kernel.test.dir}/reports/${kernel.mode}.mode"/>
         <mkdir dir="${report.dir}" />
@@ -148,7 +160,11 @@
             <formatter type="xml"/>
             <batchtest todir="${report.dir}" unless="test.case">
                 <fileset dir="${kernel.test.javasrc}"> 
-                    <patternset refid="kernel.test.java.pattern"/>
+                   <!-- <patternset refid="kernel.test.java.pattern"/> -->
+                    <include name="org/apache/harmony/**/*Test.java" />
+                    <include name="java/lang/**/*Test*.java" />
+                    <excludesfile name="${exclude.file}" />
+                    
                 </fileset>
             </batchtest>
             <test name="${test.case}" todir="${report.dir}" if="test.case" />

Modified: harmony/enhanced/drlvm/trunk/build/make/test.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/test.properties?view=diff&rev=477741&r1=477740&r2=477741
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/test.properties (original)
+++ harmony/enhanced/drlvm/trunk/build/make/test.properties Tue Nov 21 08:51:52 2006
@@ -30,7 +30,7 @@
 #
 #  instantiate one VM for kernel testsuite
 #  or one per test
-#  valid values are "one" and "perTest"
+#  valid values are "once" and "perTest"
 #
 kernel.test.forkmode=once
 



Mime
View raw message