[jbosstools-commits] JBoss Tools SVN: r30180 - trunk/tests/plugins/org.jboss.tools.tests.performance/scripts.

Author: lzoubek(a)redhat.com Date: 2011-03-31 08:55:40 -0400 (Thu, 31 Mar 2011) New Revision: 30180 Modified: trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/get-deps.xml trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-perf-prepare.xml Log: perf tests: fixed auto-install part Modified: trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/get-deps.xml =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/get-deps.xml 2011-03-31 12:45:00 UTC (rev 30179) +++ trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/get-deps.xml 2011-03-31 12:55:40 UTC (rev 30180) @@ -153,13 +153,13 @@ ant.fail(message:'Update site unzip error, '+properties['tmpdir']+'/upd-site/features does not exist') } featuresDir.eachFile({ - match = it.getName() =~ '(org.jboss.tools[^_]+)_.*v(.*)\\.jar' + match = it.getName() =~ '(org.jboss.[^_]+)_.*v(.*)\\.jar' if (match.matches()) { version = match[0][2] features += ","+match[0][1]+'.feature.group' } }) - features = features.substring(1) + properties['jbt.install.features'] = features.substring(1) output=properties['destdir']+'/jboss-tools-'+version+'.zip' properties['runtimeArchive']='../../jboss-tools-'+version+'.zip' println 'Detetected JBoss Tools version '+version @@ -245,7 +245,7 @@ cmd+=" -profile epp.package.jee" cmd+=" -destination " + eclipse cmd+=" -bundlepool " + eclipse - cmd+=" -installIUs "+features + cmd+=" -installIUs "+properties['jbt.install.features'] cmd+=" -repository file:"+repo+",file:"+eclipse+","+thirdpartySites proc = cmd.execute (null, new File(eclipse)) proc.consumeProcessOutput (System.out, System.err) Modified: trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-perf-prepare.xml =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-perf-prepare.xml 2011-03-31 12:45:00 UTC (rev 30179) +++ trunk/tests/plugins/org.jboss.tools.tests.performance/scripts/jbt-perf-prepare.xml 2011-03-31 12:55:40 UTC (rev 30180) @@ -24,7 +24,7 @@ <property name="perf.memory" value="-Xms256M -Xmx512M -XX:MaxPermSize=256M"/> <property name="perf.db" value="-Declipse.perf.dbloc=${jbt.perf.db.loc};${jbt.perf.db.props}"/> <property name="perf.config" value="-Declipse.perf.config=build=${perf.buildID};${jbt.host.desc}"/> - <property name="perf.dim.config" value="-Declipse.perf.default.dim=&quot;${perf.default.dim}&quot; -Declpise.perf.results.dimensions=&quot;${perf.dimensions}&quot;"/> + <property name="perf.dim.config" value="-Declpise.perf.results.dimensions=&quot;${perf.dimensions}&quot;"/> <condition property="perf.baseBuild" value="-Declipse.perf.assertAgainst=build=${perf.baseBuildID};host=localhost;jvm=sun" else=""> <and> <isset property="perf.baseBuildID"/>