harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r595576 - in /harmony/enhanced/drlvm/trunk/build/make: build.xml targets/ehwa.test.xml targets/jvmti.test.xml targets/kernel.test.xml targets/reg.test.run.xml targets/reg.test.xml targets/smoke.test.xml targets/test.common.xml
Date Fri, 16 Nov 2007 06:44:57 GMT
Author: varlax
Date: Thu Nov 15 22:44:56 2007
New Revision: 595576

URL: http://svn.apache.org/viewvc?rev=595576&view=rev
Log:
Minor test improvements:
- set working dir consistently
- support "short.report" feature

Modified:
    harmony/enhanced/drlvm/trunk/build/make/build.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/ehwa.test.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/test.common.xml

Modified: harmony/enhanced/drlvm/trunk/build/make/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/build.xml?rev=595576&r1=595575&r2=595576&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build.xml Thu Nov 15 22:44:56 2007
@@ -503,6 +503,7 @@
     
     <target name="hut.test" depends="init">
         <property name="hut.module" value="*"/>
+        <property name="test.vmargs" value=""/>
         <ant antfile="${external.dep.CLASSLIB}/build.xml" inheritAll="no">
             <target name="properties"/>
             <target name="test"/>
@@ -517,6 +518,7 @@
     <target name="test2" depends="init">
         <property file="test.properties"/>
         <property name="run.all.tests" value="true"/>
+        <property name="short.report" value="true"/>
         <mkdir dir="${base.test.dir}"/>
         <parallel threadsPerProcessor="1" failonany="no">
             <ant target="hut.test"      output="${base.test.dir}/hut.log"/>

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/ehwa.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/ehwa.test.xml?rev=595576&r1=595575&r2=595576&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/ehwa.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/ehwa.test.xml Thu Nov 15 22:44:56 2007
@@ -68,8 +68,11 @@
             <isset property="equinox.launcher"/>
         </condition>
 
-        <java fork="true" jvm="${test.jvm.exe}" jar="${eclipse.launcher.jar}" 
-            resultproperty="ehwa.result">
+        <java fork="true" 
+              jvm="${test.jvm.exe}" 
+              jar="${eclipse.launcher.jar}" 
+              dir="${ehwa.test.dir}"
+              resultproperty="ehwa.result">
             <jvmarg line="${ehwa.mode.switch} ${test.vmargs}" />
             <arg line="-application org.eclipse.test.uitestapplication"/>
             <arg line="-dev bin -consolelog"/>

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml?rev=595576&r1=595575&r2=595576&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml Thu Nov 15 22:44:56 2007
@@ -111,6 +111,7 @@
                        failureproperty="${testname}.failed"
                        haltonfailure="${test.failfast}"
                        timeout="${test.timeout}"
+                       dir="${jvmti.test.dir}"
                        jvm="${test.jvm.exe}">
                     <jvmarg value="-agentpath:${jvmti.test.native.path}/${testname}/${shlib.prefix}${testname}${shlib.suffix}"/>
                     <jvmarg line="${mode.switch} ${test.vmargs}" />

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?rev=595576&r1=595575&r2=595576&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml Thu Nov 15 22:44:56 2007
@@ -114,6 +114,7 @@
             haltonfailure="${test.failfast}"
             forkmode="${kernel.test.forkmode}" 
             timeout="${test.timeout}"
+            dir="${kernel.test.dir}"
             jvm="${test.jvm.exe}">
 
             <jvmarg line="${kernel.mode.switch} ${test.vmargs}" />

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml?rev=595576&r1=595575&r2=595576&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml Thu Nov 15 22:44:56 2007
@@ -63,9 +63,7 @@
                     <then>
                         <!-- Launch the tests with a custom launchers 
                                                 placed near the tests -->
-                        <ant antfile="@{reg.test.2launch}/run.test.xml" 
-                            target="run-test" 
-                            inheritAll="true" inheritRefs="true"/>
+                        <ant antfile="@{reg.test.2launch}/run.test.xml" target="run-test"/>
                     </then>
                     <else>
                         <!-- Run standard JUnit tests -->
@@ -119,7 +117,7 @@
             <junit jvm="${test.jvm.exe}"
                    fork="yes"
                    printsummary="withOutAndErr"
-                   dir="${basedir}"
+                   dir="${reg.test.dir}"
                    failureproperty="reg.test.errors"
                    timeout="${reg.test.timeout}">
                 <jvmarg line="@{vmarg} ${test.vmargs}"/>
@@ -181,6 +179,7 @@
                   classname="@{test}"
                   resultproperty="@{test}.res.code"
                   output="${reg.test.dir}/reports/@{test}.txt"
+                  dir="${reg.test.dir}"
                   fork="yes"
                   timeout="${reg.test.timeout}">
                 <java-element/>

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.xml?rev=595576&r1=595575&r2=595576&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.xml Thu Nov 15 22:44:56 2007
@@ -16,7 +16,7 @@
      limitations under the License. -->
 <project name="REGRESSION TESTS">
     
-    <import file="${basedir}/targets/reg.test.run.xml"/>
+    <import file="reg.test.run.xml"/>
     
     <property name="reg.test.src" location="${basedir}/../../src/test/regression"/>
     <property name="reg.test.dir" location="${base.test.dir}/reg.tests"/>

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml?rev=595576&r1=595575&r2=595576&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml Thu Nov 15 22:44:56 2007
@@ -189,7 +189,7 @@
                         <var name="test.report" value="${smoke.test.dir}/reports/${class.name}_${mode.id}"/>
 
                         <java newenvironment="yes"
-                            dir="${test.jre.home}/bin"
+                            dir="${smoke.test.dir}"
                             classname="${class.name}"
                             fork="true"
                             jvm="${test.jvm.exe}"

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/test.common.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/test.common.xml?rev=595576&r1=595575&r2=595576&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/test.common.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/test.common.xml Thu Nov 15 22:44:56 2007
@@ -119,15 +119,26 @@
     
     <macrodef name="gen-test-report">
         <attribute name="dir" />
+        <attribute name="include" default="*.xml"/>
         <sequential>
             <if>
                 <not><isset property="skip.report"/></not>
                 <then>
+                    <fileset dir="@{dir}" id="@{dir}.full">
+                        <include name="@{include}" />
+                        <exclude name="TESTS-TestSuites.xml"/>
+                    </fileset>
+                    <fileset dir="@{dir}" id="@{dir}.short">
+                        <include name="@{include}" />
+                        <containsregexp expression='(errors|failures)=.[1-9]' />
+                        <exclude name="TESTS-TestSuites.xml"/>
+                    </fileset>
+                    <condition property="@{dir}.id" value="@{dir}.short" else="@{dir}.full">
+                        <isset property="short.report"/>
+                    </condition>
+                    
                     <junitreport todir="@{dir}">
-                        <fileset dir="@{dir}">
-                            <include name="*.xml" />
-                            <exclude name="TESTS-TestSuites.xml"/>
-                        </fileset>
+                        <fileset refid="${@{dir}.id}"/>
                         <report format="frames" todir="@{dir}/html" />
                     </junitreport>
                 </then>



Mime
View raw message