harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r525433 - in /harmony/enhanced/drlvm/trunk/build/make: build.xml targets/jvmti.test.xml targets/kernel.test.xml targets/smoke.test.xml test.properties
Date Wed, 04 Apr 2007 06:20:11 GMT
Author: varlax
Date: Tue Apr  3 23:20:10 2007
New Revision: 525433

URL: http://svn.apache.org/viewvc?view=rev&rev=525433
Log:
Applied HARMONY-3564 [drlvm][testing] need a key to specify additional options for VM

Modified:
    harmony/enhanced/drlvm/trunk/build/make/build.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/smoke.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=525433&r1=525432&r2=525433
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build.xml Tue Apr  3 23:20:10 2007
@@ -310,6 +310,7 @@
         <echo message="             arch = ${build.arch}" />
         <echo message="              cxx = ${build.cxx}" />
         <echo message="              cfg = ${build.cfg}" />
+        <echo message="     svn revision = ${svn.revision}" />
         <echo message="       components = ${COMPONENTS}" />
     </target>
 

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=525433&r1=525432&r2=525433
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml Tue Apr  3 23:20:10 2007
@@ -185,7 +185,7 @@
                         value="-agentpath:${jvmti.test.native.path}/${testname}/lib${testname}.so"
                         />
                     </select>
-                    <jvmarg line="${mode.switch}" />
+                    <jvmarg line="${mode.switch} ${test.vmargs}" />
                     <formatter type="brief"/>
                     <formatter type="xml" />
                     <classpath path="${jvmti.test.class.path}" />

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=525433&r1=525432&r2=525433
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml Tue Apr  3 23:20:10 2007
@@ -139,9 +139,8 @@
             timeout="${test.timeout}"
             jvm="${test.jvm.exe}">
 
-            <jvmarg value="-XX:-vm.assert_dialog" />
+            <jvmarg line="-XX:-vm.assert_dialog ${kernel.mode.switch} ${test.vmargs}"
/>
             <jvmarg value="-Dtest.resource.path=${test.resource.path}"/>
-            <jvmarg value="${kernel.mode.switch}" />
             <jvmarg value="-Xbootclasspath/a:${junit.jar}${path.separator}${test.class.path}"
/>
             <formatter type="xml"/>
             <batchtest todir="${report.dir}" unless="test.case">

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=525433&r1=525432&r2=525433
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml Tue Apr  3 23:20:10 2007
@@ -238,9 +238,8 @@
                         <echo message="Running test : ${class.name}" />
 
                         <java newenvironment="yes" dir="${build.deploy.dir}/jdk/jre/bin"
output="${build.dir}/_smoke.tests/reports/${class.name}_${mode.id}.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.id}.out.err">
-                            <jvmarg value="-XX:-vm.assert_dialog" />
+                            <jvmarg line="-XX:-vm.assert_dialog ${mode.switch} ${test.vmargs}"
/>
                             <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" />

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=525433&r1=525432&r2=525433
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/test.properties (original)
+++ harmony/enhanced/drlvm/trunk/build/make/test.properties Tue Apr  3 23:20:10 2007
@@ -43,6 +43,14 @@
 #
 kernel.test.forkmode=once
 
+# --------------------------------------------
+#
+#  test.vmargs
+#
+#  additional arguments for vm to run jvmti, smoke and kernel tests
+#
+test.vmargs=""
+
 #--------------------------------------------
 #
 #  VM execution modes definitions



Mime
View raw message