[jboss-svn-commits] JBL Code SVN: r33782 - labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts.

[jboss-svn-commits at lists.jboss.org]

Author: whitingjr
Date: 2010-07-08 11:27:34 -0400 (Thu, 08 Jul 2010)
New Revision: 33782

Modified:
   labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml
   labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-commands.xml
Log:
Added task to verify the collected logs.
Added submission generating task.

Modified: labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml	2010-07-08 15:02:43 UTC (rev 33781)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml	2010-07-08 15:27:34 UTC (rev 33782)
@@ -27,13 +27,26 @@
    <property environment="env"/>
    <property name="framework.properties.dir" location="${env.USER_HOME}/.specjms" />
    <property name="framework.file" location="${framework.properties.dir}/specjms.seq" />
+   
+   <fileset id="previous-run-files" dir="config">
+      <includesfile name="run.conf"/>
+      <includesfile name="jstat-hornetq.txt"/>
+      <includesfile name="verbose-gc.txt"/>
+      <includesfile name="verbose-gc-stats.txt"/>
+   </fileset>
+   
+   <fileset id="collected-log-files" dir="${spec.install.dir}/output/${org.spec.internal.runId}">
+      <includesfile name="run.conf"/>
+      <includesfile name="jstat-hornetq.txt"/>
+      <includesfile name="verbose-gc.txt"/>
+      <includesfile name="verbose-gc-stats.txt"/>
+   </fileset>
 
    <target name="clean">
       <echo>Removing prior run collected data.</echo>
-      <delete file="config/run.conf" />
-      <delete file="config/jstat-hornetq.txt" />
-      <delete file="config/verbose-gc.txt" />
-      <delete file="config/verbose-gc-stats.txt" />
+      <delete>
+         <fileset refid="previous-run-files"/>
+      </delete>
    </target>
    
    <target name="prepare-eap-server">
@@ -59,7 +72,7 @@
       <echo>Gathering configuration located on EAP server.</echo>
 
       <scp remotefile="root at hornetq:/jboss-5.1.0.Branch/bin/run.conf" localTodir="${spec.install.dir}/config" failonerror="true" password="${r_p}"/>
-
+      
    </target>
 
    <target name="start-benchmark">
@@ -91,7 +104,7 @@
          <scp remotefile="root at hornetq:/jboss-5.1.0.Branch/server/production/log/jstat-hornetq.txt" localTodir="${spec.install.dir}/output/${org.spec.internal.runId}/config" failonerror="false" password="${r_p}"/>
          <scp remotefile="root at hornetq:/jboss-5.1.0.Branch/server/production/log/verbose-gc.txt" localTodir="${spec.install.dir}/output/${org.spec.internal.runId}/config" failonerror="false" password="${r_p}"/>
       </parallel>
-      
+      <copy file="{spec.install.dir}/config/ant-log.txt" todir="${spec.install.dir}/output/${org.spec.internal.runId}"/>
    </target>
    
    <target name="process-gc-stats">
@@ -103,6 +116,15 @@
       </exec>
    </target>
    
+   <target name="verify-log-collection">
+      <echo>Verifying all the collected files are present.</echo>
+      <available property="log-collection.isValid">
+         <fileset refid="collected-log-files"/>
+      </available>
+      <echo>Status of check is: ${log-collection.isValid}</echo>
+   </target>
+   
+   
    <target name="submission-preparation">
       <message echo="Preparing the submission files with values used during the benchmark run."/>
       
@@ -111,13 +133,28 @@
    <target name="generate-submission">
       <echo>Checking success of the benchmark run.</echo>
       
-      <echo>Status of run was: </echo>
+      <xmltask source="${spec.install.dir}/output/${org.spec.internal.runId}/specjms-result.xml">
+         <copy path="/specjms-result/test/@result" property="benchmark.run.pass" attrValue="true"/>
+      </xmltask>
       
+      <echo>Status of run was: ${benchmark.run.pass}</echo>
+      
+      <antcall target="generate-submission-report"/>
+      
    </target>
    
-   <target name="generate-submission-report">
+   <target name="generate-submission-report" if="benchmark.run.pass">
       <echo>Generating submission</echo>
       
+      <ant antfile="${spec.install.dir}/build.xml" target="reporter">
+         <property name="runOutputDir" value="${spec.install.dir}/output/${org.spec.internal.runId}"/>
+      </ant>
+      
+      <echo>Copying the generated submission to the output directory.</echo>
+      <copy todir="${spec.install.dir}/output/${org.spec.internal.runId}" >
+         <fileset dir="${spec.install.dir}/submission"/>
+      </copy>
+      
    </target>
    
    

Modified: labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-commands.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-commands.xml	2010-07-08 15:02:43 UTC (rev 33781)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-commands.xml	2010-07-08 15:27:34 UTC (rev 33782)
@@ -29,7 +29,7 @@
 	   <ant antfile="build-api.xml" target="stop-eap-server"/>
 	   <ant antfile="build-api.xml" target="gather-logs"/>
 	   <ant antfile="build-api.xml" target="process-gc-stats"/>
-	   
+	   <ant antfile="build-api.xml" target="verify-log-collection"/>
 	   <ant antfile="build-api.xml" target="generate-submission"/>
 	</target>