harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r538627 - in /harmony/enhanced/buildtest/branches/2.0/adaptors/dacapo: adaptor.xml parameters.xml publisher.xml readme.txt
Date Wed, 16 May 2007 15:11:16 GMT
Author: smishura
Date: Wed May 16 08:11:15 2007
New Revision: 538627

URL: http://svn.apache.org/viewvc?view=rev&rev=538627
Log:
Apply patch from HARMONY-3681 that fixes Dacapo suite:
([testing] Dacapo benchmark integration to the buildtest infrastructure)

Removed:
    harmony/enhanced/buildtest/branches/2.0/adaptors/dacapo/publisher.xml
Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/dacapo/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/dacapo/parameters.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/dacapo/readme.txt

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/dacapo/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/dacapo/adaptor.xml?view=diff&rev=538627&r1=538626&r2=538627
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/dacapo/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/dacapo/adaptor.xml Wed May 16 08:11:15
2007
@@ -17,6 +17,8 @@
 
 <project name="dacapo" default="run" basedir=".">
 
+    <property environment="env"/>
+    
     <property name="work.dir" location="${results.dir}/${suite.name}"/>
     <property name="output.log" value="${work.dir}/${suite.name}_output.txt"/>
     
@@ -28,24 +30,46 @@
         <!-- download dacapo if needed-->
         <available property="doesnt.need.download" file="${checkouts.dir}/${suite.name}/${dacapo.parameters.optional.jar.name}"/>
         <antcall target="-dacapo.download"/>
+
+        <!-- extract xalan.jar from dacapo.jar as it's needed for xalan workload -->
+        <!-- we're checking here antlr/* presence by xalan.jar presence for simplicity
-->
+        <available property="doesnt.need.extracting" file="${checkouts.dir}/${suite.name}/xalan.jar"/>
+        <antcall target="-xalan_antlr.extracting"/>
+
     </target>
 
     <target name="-dacapo.download" unless="doesnt.need.download">
         <get src="${dacapo.parameters.optional.download.address}/${dacapo.parameters.optional.jar.name}"
             dest="${checkouts.dir}/${suite.name}/${dacapo.parameters.optional.jar.name}"
usetimestamp="false" verbose="true"/>
     </target>
-    
+
+    <target name="-xalan_antlr.extracting" unless="doesnt.need.extracting">
+        <unjar src="${checkouts.dir}/${suite.name}/${dacapo.parameters.optional.jar.name}"
dest="${checkouts.dir}/${suite.name}">
+            <patternset includes="xalan.jar,antlr/**/*"/>
+        </unjar>
+    </target>
+
     <target name="run">
         <description>${suite.name} run</description>
         
         <echo file="${output.log}" message="Running of ${dacapo.parameters.optional.jar.name}
on ${dacapo.jdk.to.test.home} runtime...${line.separator}"/>
         <echo file="${output.log}" message="Set of tests: ${dacapo.parameters.optional.benchmarks}${line.separator}"
append="true"/>
-        
+
+        <!-- get version info from runtime to attach it to report -->
+        <echo file="${results.dir}/${suite.name}/version.log"></echo>
+        <exec executable="${dacapo.jdk.to.test.home}/bin/java" dir="${results.dir}/${suite.name}"
failonerror="false">
+            <arg line="-version"/>
+            <redirector alwaysLog="true" output="${results.dir}/${suite.name}/version.log"/>
+        </exec>
+
         <exec executable="${dacapo.jdk.to.test.home}/bin/java" dir="${results.dir}/${suite.name}"
append="true" failonerror="false">
+            <arg line="-Xbootclasspath/p:${checkouts.dir}/${suite.name}/xalan.jar${path.separator}${checkouts.dir}/${suite.name}"/>
             <arg line="-jar ${checkouts.dir}/${suite.name}/${dacapo.parameters.optional.jar.name}"/>
             <arg line="-s ${dacapo.parameters.optional.size}"/>
             <arg line="${dacapo.parameters.optional.benchmarks}"/>
             <redirector alwaysLog="true" output="${output.log}"/>
+            <env key="JAVA_HOME" value="${dacapo.jdk.to.test.home}"/>
+            <env key="PATH" value="${dacapo.jdk.to.test.home}/bin${path.separator}${env.PATH}"/>
         </exec>
 
         <!-- count "number" of requested workloads -->

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/dacapo/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/dacapo/parameters.xml?view=diff&rev=538627&r1=538626&r2=538627
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/dacapo/parameters.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/dacapo/parameters.xml Wed May 16 08:11:15
2007
@@ -1,4 +1,4 @@
-<parameters depends="classlib,drlvm">
+<parameters depends="drlvm">
 
     <required>
         <jdk.to.test.home description="Home of the Java runtime to run Dacapo on" 
@@ -18,9 +18,7 @@
             value="dacapo-2006-10-MR2.jar"/>
     </optional>
 
-    <cc>
-        <publisher value="${adaptors.dir}/${suite.name}/publisher.xml"/>
-    </cc>
+    <cc/>
 
 </parameters>
 

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/dacapo/readme.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/dacapo/readme.txt?view=diff&rev=538627&r1=538626&r2=538627
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/dacapo/readme.txt (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/dacapo/readme.txt Wed May 16 08:11:15
2007
@@ -7,21 +7,17 @@
 the location specified by two optional parameters: 'download.address' and
 'jar.name'. By default they are pointing to sourceforge site. If, by any 
 change, you already have the Dacapo jar, and would like to skip the downloading
-step, you can simply put tjhe jar to 'build/checkouts/dacapo' directory.
+step, you can simply put the jar to 'build/checkouts/dacapo' directory.
 
 Another optional parameters are: 
 1) 'benchmarks' - specifying a set of benchmarks to run. By default the list 
-    contains all available benchmarks.
+    contains all available benchmarks. 
+    NOTE: to make chart benchmark working on linux, one should run X server
+    and provide proper DISPLAY variable in the environment prior to running,
+    the runner doesn't yet run X server by itself.
 2) 'size' - Specifies the workload size, can be 'small', 'default' or 'large'.
     By default it's 'small'
-3) 'always.mail' - when set to 'true', notifications are being sent after each 
-    run; when 'false', only changes between passed/failed state are reported.
 
 The benchmark run is considered to be PASSED, if a number of PASSED workloads 
 is equal to the number of workloads specified by 'benchmarks' parameter and to 
 be FAILED otherwise.
-
-The notification contains finishing lines of each workload's log in case of
-normal execution of the benchmark, and the whole log if the run was considered 
-FAILED.
-



Mime
View raw message