[jboss-svn-commits] JBL Code SVN: r31624 - labs/jbosstm/workspace/whitingjr/trunk/performance.

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

Author: whitingjr
Date: 2010-02-12 13:12:30 -0500 (Fri, 12 Feb 2010)
New Revision: 31624

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
Log:
Conditionally categorise based on profiling of test being on or off.

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2010-02-12 17:21:58 UTC (rev 31623)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2010-02-12 18:12:30 UTC (rev 31624)
@@ -334,7 +334,10 @@
 		<property name="db-vendor-package.xpath" value="${db-vendor-package.xpath.A},${db-vendor-package.xpath.B}" />
 		<loadproperties srcfile="src/main/resources/properties/categorise/categorise.properties">
 		</loadproperties>
-
+		
+		<condition property="ignore-categorise">
+         <equals arg1="${profiled}" arg2="n" />
+      </condition>
 	</target>
 
 	<target name="compile" depends="prepare,check-xa-support">
@@ -359,7 +362,7 @@
 		</testng>
 	</target>
 
-	<target name="categorise" depends="profile">
+	<target name="categorise" depends="profile" unless="ignore-categorise">
 
 		<property name="xpaths-csv" value="${testcase.xpaths},${db-vendor.method.xpaths.A},${db-vendor.method.xpaths.B}" />
 		<tstamp />
@@ -436,8 +439,11 @@
 	</target>
 
 	<target name="transform">
-		<property name="db-vendor-package.A" value="com.mysql" />
-		<delete file="logs/agregate.xsl" />
+		<!-- -Ddate=xxxxxxxx -Dtime=xxxx -Dlogs-base-dir=/xxxx/xxxx -->
+		<xslt style="src/main/resources/xsl/convert-xml-to-csv.xsl" in="${logs-base-dir}/${date}-${time}/${date}-${time}-profile-analysis-04.xml" out="${logs-base-dir}/${date}-${time}/${date}-${time}-profile-analysis.csv">
+         <param name="db-vendor-package.A" expression="mysql" />
+         <param name="db-vendor-package.B" expression="mysql" />
+      </xslt>
 	</target>
 	<target name="transform-switch-package">
 		<xslt style="src/main/resources/xsl/package-switch-compactor.xsl" in="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-raw.xml" out="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-compacted.xml">
@@ -500,7 +506,7 @@
 	be pasted into the template spreadsheet.
 	 -->
 	<target name="concat-data">
-		<property name="logs-dir-base" value="/home/whitingjr/tsperf/logs/20100203"/>
+		<property name="logs-dir-base" value="/home/whitingjr/tsperf/logs/batch-23/20100212-postgresql"/>
 		
 		<concat destfile="${logs-dir-base}/csv-data.csv">
 		   <path>