harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r508456 - in /harmony/enhanced/drlvm/trunk/build/make: ./ excludes/ targets/
Date Fri, 16 Feb 2007 15:45:57 GMT
Author: gshimansky
Date: Fri Feb 16 07:45:56 2007
New Revision: 508456

URL: http://svn.apache.org/viewvc?view=rev&rev=508456
Log:
Applied HARMONY-3182 [drlvm][testing] run modes of DRLVM tests should be unified

I had to make some modifications, exclude lists were not copied correctly
in some cases, kernel.test.xml still used underfined kernel.test.mode
property.

Tests passed on Ubuntu6 x86, Windows XP x86 and SuSE9 x86_64


Added:
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_jvmti.linux.x86.opt   (with
props)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_jvmti.windows.x86.opt 
 (with props)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.ia64.int  
(with props)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.ia64.jet  
(with props)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.ia64.opt  
(with props)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86.int   (with
props)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86.jet   (with
props)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86.opt   (with
props)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86_64.int
  (with props)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86_64.jet
  (with props)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86_64.opt
  (with props)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86.int 
 (with props)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86.jet 
 (with props)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86.opt 
 (with props)
Removed:
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.ia64.interpreter
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86.interpreter
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86.jit
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86_64.interpreter
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86_64.jit
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86.interpreter
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86.jit
Modified:
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.int  
(props changed)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.jet  
(props changed)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.opt  
(props changed)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86_64.int
  (props changed)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86_64.jet
  (props changed)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86_64.opt
  (props changed)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.int
  (props changed)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.jet
  (props changed)
    harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.opt
  (props changed)
    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/smoke.test.xml
    harmony/enhanced/drlvm/trunk/build/make/test.properties

Added: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_jvmti.linux.x86.opt
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_jvmti.linux.x86.opt?view=auto&rev=508456
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_jvmti.linux.x86.opt (added)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_jvmti.linux.x86.opt Fri
Feb 16 07:45:56 2007
@@ -0,0 +1,3 @@
+Breakpoint1/Breakpoint1.java
+SingleStep1/SingleStep1.java
+VMInit1/VMInit1.java
\ No newline at end of file

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_jvmti.linux.x86.opt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_jvmti.windows.x86.opt
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_jvmti.windows.x86.opt?view=auto&rev=508456
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_jvmti.windows.x86.opt (added)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_jvmti.windows.x86.opt Fri
Feb 16 07:45:56 2007
@@ -0,0 +1,3 @@
+Breakpoint1/Breakpoint1.java
+SingleStep1/SingleStep1.java
+VMInit1/VMInit1.java
\ No newline at end of file

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_jvmti.windows.x86.opt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.int
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.jet
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86.opt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86_64.int
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86_64.jet
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.linux.x86_64.opt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.int
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.jet
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_kernel.windows.x86.opt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.ia64.int
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.ia64.int?view=auto&rev=508456
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.ia64.int (added)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.ia64.int Fri
Feb 16 07:45:56 2007
@@ -0,0 +1,15 @@
+Check.java
+PerfCheck.java
+
+# HARMONY-3018
+StackTest.java
+exception/FinalizeStackTest.java
+
+# HARMONY-3033
+gc/Mark.java
+
+gc/LOS.java
+gc/MultiThreads.java
+
+# fails intermittently: HARMONY-3038
+perf/MultiThreadsSimple.java

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.ia64.int
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.ia64.jet
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.ia64.jet?view=auto&rev=508456
==============================================================================
    (empty)

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.ia64.jet
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.ia64.opt
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.ia64.opt?view=auto&rev=508456
==============================================================================
    (empty)

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.ia64.opt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86.int
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86.int?view=auto&rev=508456
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86.int (added)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86.int Fri
Feb 16 07:45:56 2007
@@ -0,0 +1,11 @@
+Check.java
+PerfCheck.java
+classloader/StressLoader.java
+gc/Mark.java
+gc/MultiThreads.java
+io/Integers.java
+
+# fails on ubuntu 6
+
+stress/Threads.java
+stress/Mix.java

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86.int
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86.jet
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86.jet?view=auto&rev=508456
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86.jet (added)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86.jet Fri
Feb 16 07:45:56 2007
@@ -0,0 +1,9 @@
+Check.java
+PerfCheck.java
+classloader/StressLoader.java
+gc/LOS.java
+gc/MultiThreads.java
+
+# breaks on ubuntu 6 w/ OOME
+stress/Threads.java
+stress/Mix.java

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86.jet
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86.opt
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86.opt?view=auto&rev=508456
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86.opt (added)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86.opt Fri
Feb 16 07:45:56 2007
@@ -0,0 +1,12 @@
+Check.java
+PerfCheck.java
+classloader/StressLoader.java
+gc/LOS.java
+gc/Finalizer.java
+gc/MultiThreads.java
+gc/PhantomReferenceTest.java
+gc/RunFinalizersOnExitTest.java
+
+# breaks on ubuntu 6 w/ OOME
+stress/Threads.java
+stress/Mix.java

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86.opt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86_64.int
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86_64.int?view=auto&rev=508456
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86_64.int
(added)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86_64.int
Fri Feb 16 07:45:56 2007
@@ -0,0 +1,9 @@
+Check.java
+PerfCheck.java
+classloader/StressLoader.java
+gc/Mark.java
+gc/MultiThreads.java
+io/Integers.java
+stress/Stack.java
+stress/Mix.java
+

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86_64.int
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86_64.jet
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86_64.jet?view=auto&rev=508456
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86_64.jet
(added)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86_64.jet
Fri Feb 16 07:45:56 2007
@@ -0,0 +1,15 @@
+Check.java
+PerfCheck.java
+classloader/StressLoader.java
+gc/LOS.java
+gc/MultiThreads.java
+StackTest.java
+exception/FinalizeStackTest.java
+
+# fails on Ubuntu6 x86_64
+gc/Mark.java
+
+# fails intermittently 
+stress/Stack.java
+stress/Mix.java
+

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86_64.jet
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86_64.opt
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86_64.opt?view=auto&rev=508456
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86_64.opt
(added)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86_64.opt
Fri Feb 16 07:45:56 2007
@@ -0,0 +1,18 @@
+Check.java
+PerfCheck.java
+classloader/StressLoader.java
+gc/LOS.java
+gc/Finalizer.java
+gc/MultiThreads.java
+gc/PhantomReferenceTest.java
+gc/RunFinalizersOnExitTest.java
+StackTest.java
+exception/FinalizeStackTest.java
+
+# fails on Ubuntu6 x86_64
+gc/Mark.java
+
+# fails intermittently 
+stress/Stack.java
+stress/Mix.java
+

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.linux.x86_64.opt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86.int
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86.int?view=auto&rev=508456
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86.int (added)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86.int Fri
Feb 16 07:45:56 2007
@@ -0,0 +1,9 @@
+Check.java
+PerfCheck.java
+classloader/StressLoader.java
+gc/Mark.java
+gc/MultiThreads.java
+io/Integers.java
+shutdown/TestInterrupt.java
+
+stress/Mix.java

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86.int
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86.jet
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86.jet?view=auto&rev=508456
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86.jet (added)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86.jet Fri
Feb 16 07:45:56 2007
@@ -0,0 +1,8 @@
+Check.java
+PerfCheck.java
+classloader/StressLoader.java
+gc/MultiThreads.java
+io/Integers.java
+shutdown/TestInterrupt.java
+
+stress/Mix.java

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86.jet
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86.opt
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86.opt?view=auto&rev=508456
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86.opt (added)
+++ harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86.opt Fri
Feb 16 07:45:56 2007
@@ -0,0 +1,11 @@
+Check.java
+PerfCheck.java
+classloader/StressLoader.java
+gc/Finalizer.java
+gc/MultiThreads.java
+gc/PhantomReferenceTest.java
+gc/RunFinalizersOnExitTest.java
+io/Integers.java
+shutdown/TestInterrupt.java
+
+stress/Mix.java

Propchange: harmony/enhanced/drlvm/trunk/build/make/excludes/exclude.drlvm_smoke.windows.x86.opt
------------------------------------------------------------------------------
    svn:eol-style = native

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?view=diff&rev=508456&r1=508455&r2=508456
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml Fri Feb 16 07:45:56 2007
@@ -20,6 +20,8 @@
     <property name="jvmti.test.class.path" location="${jvmti.test.dir}/classes"/>
     <property name="jvmti.test.native.path" location="${jvmti.test.dir}/native"/>
 
+    <property file="test.properties"/>
+
     <patternset id="jvmti.test.src.pattern">
         <include name="*" />
         <!-- This test fails -->
@@ -116,9 +118,22 @@
     </target>
 
     <target name="run-jvmti-tests">
+        <propertycopy property="mode.name" from="${jvmti.tests.mode}.name" override="on"/>
      
+        <propertycopy property="mode.switch" from="${jvmti.tests.mode}.switch" override="on"/>
+        <if>
+            <available file="./excludes/exclude.drlvm_jvmti.${hy.platform}.${jvmti.tests.mode}"
/>
+            <then>
+                  <property name="exclude.file" location="./excludes/exclude.drlvm_jvmti.${hy.platform}.${jvmti.tests.mode}"
/>
+            </then>
+            <else>
+                  <tempfile property="temp.file" />
+                  <touch file="${temp.file}" />
+                  <property name="exclude.file" location="${temp.file}" />
+            </else>
+        </if>
         <echo>
 		==================================
-		Run JVMTI tests using ${jvmti.tests.mode}
+		Run JVMTI tests using ${mode.name}
 		==================================
 		</echo>
 
@@ -128,13 +143,15 @@
 
         <for list="${jvmti.test.src.dirs.list}" param="directory"
              delimiter=",">
+
             <sequential>
                 <var name="testname" unset="true" />
                 <basename property="testname" file="@{directory}" />
                 <echo message="Running ${testname}" />
                 <junit fork="yes"
+                       forkmode="perTest"
                        failureproperty="${testname}.failed"
-                       timeout="${jvmti.test.timeout}"
+                       timeout="${test.timeout}"
                        jvm="${build.deploy.dir}/jdk/jre/bin/java">
                     <jvmarg value="-XX:-vm.assert_dialog" />
                     <select os="win">
@@ -147,37 +164,48 @@
                         value="-agentpath:${jvmti.test.native.path}/${testname}/lib${testname}.so"
                         />
                     </select>
-                    <jvmarg line="${jvmti.tests.mode.switch}" />
+                    <jvmarg line="${mode.switch}" />
                     <formatter type="brief"/>
                     <formatter type="xml" />
                     <classpath path="${jvmti.test.class.path}" />
-                    <test name="${testname}.${testname}" todir="${report.dir}" />
+                    <batchtest todir="${report.dir}">
+                        <fileset dir="${jvmti.test.src}" >
+                            <include name="**/${testname}.java"/>
+                            <excludesfile name="${exclude.file}" />
+                        </fileset>
+                    </batchtest>
                 </junit>
                 <if>
                     <isset property="${testname}.failed" />
                     <then>
-                        <echo file="${build.semi.dir}/jvmti.test.failed" message="${testname}
failed on ${jvmti.tests.mode}${line.separator}" append="true"/>
+                        <echo file="${build.semi.dir}/jvmti.test.failed" message="${testname}
failed on ${mode.name}${line.separator}" append="true"/>
                     </then>
                 </if>
 
             </sequential>
         </for>
+        <if>
+            <not>
+                <contains string="${exclude.file}" substring="${jvmti.tests.mode}" />
+            </not>
+            <then>
+                <delete file="${exclude.file}" quiet="true" failonerror="false" />
+            </then>
+        </if>
     </target>
-
+  
     <target name="jvmti.test" depends="pre-jvmti-test">
         <delete file="${build.semi.dir}/jvmti.test.failed" failonerror="false" />
         <if>
             <equals arg1="${build.arch}" arg2="ia32" />
             <then>
-                <antcall target="run-jvmti-tests">
-                    <param name="jvmti.tests.mode" value="jit" />
-                    <param name="jvmti.tests.mode.switch" value ="" />
-                </antcall>
-
-                <antcall target="run-jvmti-tests">
-                    <param name="jvmti.tests.mode" value="interpreter" />
-                    <param name="jvmti.tests.mode.switch" value="-Xint" />
-                </antcall>
+                <for list="${test.mode}" param="mode" trim="true">
+                    <sequential>
+                        <antcall target="run-jvmti-tests" > 
+                            <param name="jvmti.tests.mode" value="@{mode}" />
+                        </antcall>
+                    </sequential>
+                </for>
             </then>
         </if>
         

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=508456&r1=508455&r2=508456
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml Fri Feb 16 07:45:56 2007
@@ -50,7 +50,7 @@
         <condition property="kernel.test.continue" value="true" else="false">
             <isfalse value="${kernel.test.failfast}"/>
         </condition>
-        <for list="${kernel.test.mode}" param="mode"
+        <for list="${test.mode}" param="mode"
             trim="true" keepgoing="${kernel.test.continue}">
             <sequential>
                 <antcall target="-run-kernel-test-batch"> 
@@ -61,7 +61,7 @@
     </target>
    
     <target name="report-kernel-test">
-        <for list="${kernel.test.mode}" param="mode"
+        <for list="${test.mode}" param="mode"
             trim="true" keepgoing="true">
             <sequential>
                 <junitreport todir="${kernel.test.dir}/reports/@{mode}.mode">
@@ -150,7 +150,7 @@
             filtertrace="no" printsummary="on" showoutput="off"
             haltonfailure="${kernel.test.failfast}"
             forkmode="${kernel.test.forkmode}" 
-            timeout="${kernel.test.timeout}"
+            timeout="${test.timeout}"
             jvm="${test.jvm.exe}">
 
             <jvmarg value="-XX:-vm.assert_dialog" />

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?view=diff&rev=508456&r1=508455&r2=508456
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml Fri Feb 16 07:45:56 2007
@@ -22,6 +22,7 @@
     <property name="smoke.test.src" location="${build.VM.home}/tests/smoke" />
     <property name="smoke.test.class.path" location="${build.dir}/_smoke.tests/classes"
/>
     <property name="smoke.test.native.path" location="${build.dir}/_smoke.tests/natives"
/>
+    <property file="test.properties"/>
 
     <patternset id="smoke.test.java.pattern">
         <include name="**/*.java"/>
@@ -108,14 +109,16 @@
             <pathelement location="${smoke.test.class.path}" />
             <fileset dir="${build.deploy.dir}/jdk/jre/lib" includes="*.jar" />
         </path>
-        <select arch="ia32,em64t">
-        <antcall target="java_test_smoke_with_jit_or_interpreter">
-            <param name="jit.or.interpreter" value="jit" />
-        </antcall>
-        </select>
-        <antcall target="java_test_smoke_with_jit_or_interpreter">
-            <param name="jit.or.interpreter" value="interpreter" />
-        </antcall>
+        <condition property="test.continue" value="true" else="false">
+            <isset property="run.all.tests"/>
+        </condition>
+        <for list="${test.mode}" param="mode" trim="true">
+            <sequential>
+                <antcall target="java_test_smoke_with_jit_or_interpreter"> 
+                    <param name="jit.or.interpreter" value="@{mode}" />
+                </antcall>
+            </sequential>
+        </for>
     </target>
 
     <target name="build_report">
@@ -135,6 +138,9 @@
     </target>
 
     <target name="java_test_smoke_with_jit_or_interpreter">
+        <propertycopy property="mode.name" from="${jit.or.interpreter}.name" override="on"/>
      
+        <propertycopy property="mode.switch" from="${jit.or.interpreter}.switch" override="on"/>
+
         <condition property="using.jit.or.jitrino" value="Using interpreter">
             <contains string="${jit.or.interpreter}" substring="int" />
         </condition>
@@ -208,7 +214,7 @@
                     <then>
                         <!--
                                     Run smoke test @{test} on DRLVM.
-                                  -->
+                        -->
                         <condition property="executable.postfix" value=".exe">
                             <isset property="if.win" />
                         </condition>
@@ -216,40 +222,23 @@
 
                         <echo message="Running test : ${class.name}" />
 
-                        <if>
-                            <not>
-                                <equals arg1="${int.or.jit.arg}" arg2="" />
-                            </not>
-                            <then>
-                                <java newenvironment="yes" dir="${build.deploy.dir}/jdk/jre/bin"
output="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out" classname="${class.name}"
fork="true" jvm="${build.deploy.dir}/jdk/jre/bin/java${executable.postfix}" error="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out.err">
-                                    <jvmarg value="-XX:-vm.assert_dialog" />
-                                    <jvmarg value="-Djava.library.path=${smoke.test.native.path}/${outdir}"
/>
-                                    <jvmarg value="${int.or.jit.arg}" />
-                                    <jvmarg value="-classpath" />
-                                    <jvmarg value="${smoke.test.class.path}" />
-                                    <env key="JAVA_HOME" value="${build.deploy.dir}/jdk/jre"
/>
-                                    <env key="LD_LIBRARY_PATH" value="${build.deploy.dir}/jdk/jre/bin:${env.LD_LIBRARY_PATH}"
/>
-                                </java>
-                            </then>
-                            <else>
-                                <java newenvironment="yes" dir="${build.deploy.dir}/jdk/jre/bin"
output="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out" classname="${class.name}"
fork="true" jvm="${build.deploy.dir}/jdk/jre/bin/java${executable.postfix}" error="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out.err">
-                                    <jvmarg value="-XX:vm.assert_dialog=0" />
-                                    <jvmarg value="-Djava.library.path=${smoke.test.native.path}/${outdir}"
/>
-                                    <jvmarg value="-classpath" />
-                                    <jvmarg value="${smoke.test.class.path}" />
+                        <java newenvironment="yes" dir="${build.deploy.dir}/jdk/jre/bin"
output="${build.dir}/_smoke.tests/reports/${class.name}_${mode.name}.out" classname="${class.name}"
fork="true" jvm="${build.deploy.dir}/jdk/jre/bin/java${executable.postfix}" error="${build.dir}/_smoke.tests/reports/${class.name}_${mode.name}.out.err">
+                            <jvmarg value="-XX:-vm.assert_dialog=0" />
+                            <jvmarg value="-Djava.library.path=${smoke.test.native.path}/${outdir}"
/>
+                            <jvmarg value="${mode.switch}" />
+                            <jvmarg value="-classpath" />
+                            <jvmarg value="${smoke.test.class.path}" />
+                            <env key="JAVA_HOME" value="${build.deploy.dir}/jdk/jre" />
+                            <env key="LD_LIBRARY_PATH" value="${build.deploy.dir}/jdk/jre/bin:${env.LD_LIBRARY_PATH}"
/>
+                        </java>
 
-                                    <env key="JAVA_HOME" value="${build.deploy.dir}/jdk/jre"
/>
-                                    <env key="LD_LIBRARY_PATH" value="${build.deploy.dir}/jdk/jre/bin:${env.LD_LIBRARY_PATH}"
/>
-                                </java>
-                            </else>
-                        </if>
                         <!-- load the test output file to the property - will be used
later -->
-                        <loadfile property="@{test}.out" srcFile="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out"
/>
+                        <loadfile property="@{test}.out" srcFile="${build.dir}/_smoke.tests/reports/${class.name}_${mode.name}.out"
/>
                         <!--
                                     Run smoke test @{test} on JAVA_HOME's JVM.
                                     If ${keywords} contains "golden" we have to run the test
twice:
                                     on JAVA_HOME's JVM and on the DRLVM. To compare outputs.
-                                  -->
+                        -->
                         <if>
                             <isset property="@{test}.is.golden" />
                             <then>
@@ -257,13 +246,13 @@
                                     <available file="${env.JAVA_HOME}/bin/java${executable.postfix}"
/>
                                 </condition>
                                 <property name="java.executable" value="${env.JAVA_HOME}/bin/java${executable.postfix}"
/>
-                                <java output="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.golden"
classname="${class.name}" fork="true" jvm="${java.executable}" error="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.golden.err">
+                                <java output="${build.dir}/_smoke.tests/reports/${class.name}_${mode.name}.golden"
classname="${class.name}" fork="true" jvm="${java.executable}" error="${build.dir}/_smoke.tests/reports/${class.name}_${mode.name}.golden.err">
                                     <jvmarg value="-classpath" />
                                     <jvmarg value="${java.path.property}" />
                                     <env key="LD_LIBRARY_PATH" value="${env.JAVA_HOME}/bin:${env.LD_LIBRARY_PATH}"
/>
                                 </java>
                                 <!-- load the test output file to the property - will
be used later -->
-                                <loadfile property="@{test}.golden" srcFile="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.golden"
/>
+                                <loadfile property="@{test}.golden" srcFile="${build.dir}/_smoke.tests/reports/${class.name}_${mode.name}.golden"
/>
                             </then>
                         </if>
                         <!-- Handling the test output (or outputs in "golden" case) -->
@@ -293,52 +282,52 @@
                                 <echo message=" PASSED : ${class.name}" />
 
                                 <!-- create xml-file with test's results -->
-<echo file="${build.dir}/_smoke.tests/reports/TEST-${class.name}_${jit.or.interpreter}.xml"><![CDATA[<?xml
version="1.0" encoding="UTF-8" ?>
+<echo file="${build.dir}/_smoke.tests/reports/TEST-${class.name}_${mode.name}.xml"><![CDATA[<?xml
version="1.0" encoding="UTF-8" ?>
 <testsuite errors="0" failures="0" name="@@@@@" tests="1" time="0.01">
 <testcase classname="@@@@@" name="test" time="0.1"/>
 <system-out><![CDATA[@out]!]></system-out>
 <system-err><![CDATA[@err]!]></system-err>
 </testsuite>]]> 
 </echo>
-                                <replace file="${build.dir}/_smoke.tests/reports/TEST-${class.name}_${jit.or.interpreter}.xml"
token="@@@@@" value="${class.name}_${jit.or.interpreter}" /> 
+                                <replace file="${build.dir}/_smoke.tests/reports/TEST-${class.name}_${mode.name}.xml"
token="@@@@@" value="${class.name}_${mode.name}" /> 
                             </then>
                             <else>
                                 <echo message="*** FAILED **** : ${class.name}" />
-                                <echo message="*** FAILED **** : ${class.name} on ${jit.or.interpreter}${line.separator}"
file="${build.semi.dir}/smoke.test.failed" append="true"/>
+                                <echo message="*** FAILED **** : ${class.name} on ${mode.name}${line.separator}"
file="${build.semi.dir}/smoke.test.failed" append="true"/>
 
                                 <!-- create xml-file with test's results -->
-<echo file="${build.dir}/_smoke.tests/reports/TEST-${class.name}_${jit.or.interpreter}.xml"><![CDATA[<?xml
version="1.0" encoding="UTF-8" ?>
+<echo file="${build.dir}/_smoke.tests/reports/TEST-${class.name}_${mode.name}.xml"><![CDATA[<?xml
version="1.0" encoding="UTF-8" ?>
 <testsuite errors="0" failures="1" name="@@@@@" tests="1" time="0.01">
 <testcase classname="@@@@@" name="test" time="0.1"><error message="FAILED"/></testcase>
 <system-out><![CDATA[@out]!]></system-out>
 <system-err><![CDATA[@err]!]></system-err>
 </testsuite>]]> 
 </echo>
-                                <replace file="${build.dir}/_smoke.tests/reports/TEST-${class.name}_${jit.or.interpreter}.xml"
token="@@@@@" value="${class.name}_${jit.or.interpreter}" /> 
+                                <replace file="${build.dir}/_smoke.tests/reports/TEST-${class.name}_${mode.name}.xml"
token="@@@@@" value="${class.name}_${mode.name}" /> 
                             </else>
                         </if>
 
                         <!-- grab System.out to xml-file -->
-                        <loadfile property="@{test}.tmp.out" srcFile="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out"
/>
+                        <loadfile property="@{test}.tmp.out" srcFile="${build.dir}/_smoke.tests/reports/${class.name}_${mode.name}.out"
/>
                         <if>
                             <isset property="@{test}.tmp.out" />
                             <then>
-                                <replace file="${build.dir}/_smoke.tests/reports/TEST-${class.name}_${jit.or.interpreter}.xml"
token="@out]!" value="${@{test}.tmp.out}]" />
+                                <replace file="${build.dir}/_smoke.tests/reports/TEST-${class.name}_${mode.name}.xml"
token="@out]!" value="${@{test}.tmp.out}]" />
                             </then>
                             <else>
-                                <replace file="${build.dir}/_smoke.tests/reports/TEST-${class.name}_${jit.or.interpreter}.xml"
token="@out]!" value="]" />
+                                <replace file="${build.dir}/_smoke.tests/reports/TEST-${class.name}_${mode.name}.xml"
token="@out]!" value="]" />
                             </else>
                         </if>
                         
                         <!-- grab System.err to xml-file -->
-                        <loadfile property="@{test}.tmp.err" srcFile="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.out.err"
/>
+                        <loadfile property="@{test}.tmp.err" srcFile="${build.dir}/_smoke.tests/reports/${class.name}_${mode.name}.out.err"
/>
                         <if>
                             <isset property="@{test}.tmp.err" />
                             <then>
-                                <replace file="${build.dir}/_smoke.tests/reports/TEST-${class.name}_${jit.or.interpreter}.xml"
token="@err]!" value="${@{test}.tmp.err}]" />
+                                <replace file="${build.dir}/_smoke.tests/reports/TEST-${class.name}_${mode.name}.xml"
token="@err]!" value="${@{test}.tmp.err}]" />
                             </then>
                             <else>
-                                <replace file="${build.dir}/_smoke.tests/reports/TEST-${class.name}_${jit.or.interpreter}.xml"
token="@err]!" value="]" />
+                                <replace file="${build.dir}/_smoke.tests/reports/TEST-${class.name}_${mode.name}.xml"
token="@err]!" value="]" />
                             </else>
                         </if>
 

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=508456&r1=508455&r2=508456
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/test.properties (original)
+++ harmony/enhanced/drlvm/trunk/build/make/test.properties Fri Feb 16 07:45:56 2007
@@ -1,84 +1,87 @@
-#
-#  Basic controls of the test system.  Note that the quotes
-#  used to delineate options are not used when specifying
-#  values
-#
-#---------------------------------------------
-#
-#   kernel.test.mode
-#
-# configures how tests are run wrt 
-# which jit or interpreter
-#
-# valid values are comma separated list
-# of VM execution modes, 
-# like defined below "jet", "opt" and "int"
-#
-kernel.test.mode=jet,opt,int
-
-# --------------------------------------------
-#
-#  kernel.test.failfast
-#
-# determines if tests should continue on failure
-# valid values are "off" and "on"
-#
-kernel.test.failfast=off
-
-# --------------------------------------------
-#
-#  kernel.test.forkmode
-#
-#  instantiate one VM for kernel testsuite
-#  or one per test
-#  valid values are "once" and "perTest"
-#
-kernel.test.forkmode=once
-
-#--------------------------------------------
-#
-#  kernel.test.timeout
-#
-#  time limit to complete kernel test run
-#  in units of milliseconds
-kernel.test.timeout=3600000
-
-#--------------------------------------------
-#
-#  VM execution modes definitions
-#
-#  <mode>.name		human readable description of the mode
-#  <mode>.switch	cmd-line options to turn the mode on; 
-#					beware to avoid empty switch
-
-jit.name=Client mode JIT (default)
-jit.switch=-Dbogus
-
-jet.name=jitrino.JET
-jet.switch=-Xem:jet
-
-opt.name=jitrino.OPT
-opt.switch=-Xem:opt
-
-int.name=interpreter
-int.switch=-Xint
-
-#--------------------------------------------
-#
-#  Eclipse HelloWorld development scenario (aka EHWA)
-#
-#  ehwa.test.mode	comma separated list of modes to run EHWA on
-
-ehwa.test.mode=jet,opt,int
-
-# Locations to obtain platform specific Eclipse SDK bundle
-# A bundle will be downloaded and stored for local use, unless 
-# ECLIPSE_HOME environment variable points to existing Eclipse installation
- 
-eclipse.mirror=http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/eclipse/downloads/drops/R-3.2.1-200609210945
-eclipse.win.x86.url=${eclipse.mirror}/eclipse-SDK-3.2.1-win32.zip
-eclipse.win.x86_64.url=${eclipse.mirror}/eclipse-SDK-3.2.1-win32-x86_64.zip
-eclipse.win.ia64.url=${eclipse.mirror}/eclipse-SDK-3.2.1-win32-ia64.zip
-eclipse.linux.x86.url=${eclipse.mirror}/eclipse-SDK-3.2.1-linux-gtk.tar.gz
-eclipse.linux.x86_64.url=${eclipse.mirror}/eclipse-SDK-3.2.1-linux-gtk-x86_64.tar.gz
-eclipse.linux.ia64.url=${eclipse.mirror}/eclipse-SDK-3.2.1-linux-gtk-ia64.tar.gz
+#
+#  Basic controls of the test system.  Note that the quotes
+#  used to delineate options are not used when specifying
+#  values
+#
+#---------------------------------------------
+#
+#   test.mode
+#
+# configures how tests are run wrt 
+# which jit or interpreter
+#
+# valid values are comma separated list
+# of VM execution modes, 
+# like defined below "jet", "opt" and "int"
+#
+test.mode=jet,opt,int
+
+#--------------------------------------------
+#
+#  test.timeout
+#
+#  time limit to complete test run
+#  in units of milliseconds
+test.timeout=3600000
+
+# --------------------------------------------
+#
+#  kernel.test.failfast
+#
+# determines if tests should continue on failure
+# valid values are "off" and "on"
+#
+kernel.test.failfast=off
+
+# --------------------------------------------
+#
+#  kernel.test.forkmode
+#
+#  instantiate one VM for kernel testsuite
+#  or one per test
+#  valid values are "once" and "perTest"
+#
+kernel.test.forkmode=once
+
+#--------------------------------------------
+#
+#  VM execution modes definitions
+#
+#  <mode>.name		human readable description of the mode
+#  <mode>.switch	cmd-line options to turn the mode on; 
+#					beware to avoid empty switch
+
+jit.name=Client mode JIT (default)
+jit.switch=-Dbogus
+
+jet.name=jitrino.JET
+jet.switch=-Xem:jet
+
+opt.name=jitrino.OPT
+opt.switch=-Xem:opt
+
+srv.name=jitrino.SRV
+srv.switch=-Xem:server
+
+int.name=interpreter
+int.switch=-Xint
+
+#--------------------------------------------
+#
+#  Eclipse HelloWorld development scenario (aka EHWA)
+#
+#  ehwa.test.mode	comma separated list of modes to run EHWA on
+
+ehwa.test.mode=jet,opt,int
+
+# Locations to obtain platform specific Eclipse SDK bundle
+# A bundle will be downloaded and stored for local use, unless 
+# ECLIPSE_HOME environment variable points to existing Eclipse installation
+ 
+eclipse.mirror=http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/eclipse/downloads/drops/R-3.2.1-200609210945
+eclipse.win.x86.url=${eclipse.mirror}/eclipse-SDK-3.2.1-win32.zip
+eclipse.win.x86_64.url=${eclipse.mirror}/eclipse-SDK-3.2.1-win32-x86_64.zip
+eclipse.win.ia64.url=${eclipse.mirror}/eclipse-SDK-3.2.1-win32-ia64.zip
+eclipse.linux.x86.url=${eclipse.mirror}/eclipse-SDK-3.2.1-linux-gtk.tar.gz
+eclipse.linux.x86_64.url=${eclipse.mirror}/eclipse-SDK-3.2.1-linux-gtk-x86_64.tar.gz
+eclipse.linux.ia64.url=${eclipse.mirror}/eclipse-SDK-3.2.1-linux-gtk-ia64.tar.gz



Mime
View raw message