Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2014-11-03 20:03:28 +0000
committerDavid Williams2014-11-03 20:03:28 +0000
commit34a113db890e111d552d1920effccaf2e5a203de (patch)
tree9894825ad3370b4685259f798acd07beb7ecf147 /production
parent95327fdc823711b72e20d110ca6355435dd1b3c4 (diff)
downloadeclipse.platform.releng.aggregator-34a113db890e111d552d1920effccaf2e5a203de.tar.gz
eclipse.platform.releng.aggregator-34a113db890e111d552d1920effccaf2e5a203de.tar.xz
eclipse.platform.releng.aggregator-34a113db890e111d552d1920effccaf2e5a203de.zip
Bug 390821 - Performance testing back end on eclipse.org
Diffstat (limited to 'production')
-rw-r--r--production/testScripts/configuration/sdk.tests/testScripts/test.xml9
-rw-r--r--production/testScripts/runTests2.xml9
2 files changed, 12 insertions, 6 deletions
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index 8b6b602d0..cd416fddd 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -1370,12 +1370,15 @@
and phpproperties.php
-->
<property name="eclipse.perf.dbloc" value="${eclipse.perf.dbloc.value}"/>
+ <!-- buildIdToUse equals either baselinePerfVersion or else equalus buildId. In either case we want to collect the data -->
<property name="eclipse.perf.config" value="build=${buildIdToUse};buildId=${buildId};testedPlatform=${testedPlatform}" />
<!--
- This "assert" property works, in this contects, because we run baseline first,
- where buildIdToUse != buildId (so, no "assert" for that baseline run).
+ This "assert" property works, in this context, because we run baseline first,
+ when buildIdToUse != buildId that is a "baseline run" (so, no "assert" for that baseline run).
+ But, when buildIdToUse == buildId that is a "normal run" so then we do want to "assert" against the already-collected baseline data.
+ Note: Order does seem to matter ... so we specify "whole" pattern (though, the "performance doc" implies otherwise).
-->
- <condition property="eclipse.perf.assertAgainst" value="build=${baselinePerfVersion}">
+ <condition property="eclipse.perf.assertAgainst" value="build=${baselinePerfVersion};buildId=${buildId};testedPlatform=${testedPlatform}">
<equals arg1="${buildIdToUse}" arg2="${buildId}" />
</condition>
<condition property="frameworkperfargs" value="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config} -Declipse.perf.assertAgainst=${eclipse.perf.assertAgainst}" else="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config}">
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
index 72ae4779a..ef5f0ae31 100644
--- a/production/testScripts/runTests2.xml
+++ b/production/testScripts/runTests2.xml
@@ -53,12 +53,15 @@
<istrue value="${baselinePerf}"/>
</condition>
<property name="eclipse.perf.dbloc" value="${eclipse.perf.dbloc.value}"/>
+ <!-- buildIdToUse equals either baselinePerfVersion or else equalus buildId. In either case we want to collect the data -->
<property name="eclipse.perf.config" value="build=${buildIdToUse};buildId=${buildId};testedPlatform=${testedPlatform}" />
<!--
- This "assert" property works, in this contects, because we run baseline first,
- where buildIdToUse != buildId (so, no "assert" for that baseline run).
+ This "assert" property works, in this context, because we run baseline first,
+ when buildIdToUse != buildId that is a "baseline run" (so, no "assert" for that baseline run).
+ But, when buildIdToUse == buildId that is a "normal run" so then we do want to "assert" against the already-collected baseline data.
+ Note: Order does seem to matter ... so we specify "whole" pattern (though, the "performance doc" implies otherwise).
-->
- <condition property="eclipse.perf.assertAgainst" value="build=${baselinePerfVersion}">
+ <condition property="eclipse.perf.assertAgainst" value="build=${baselinePerfVersion};buildId=${buildId};testedPlatform=${testedPlatform}">
<equals arg1="${buildIdToUse}" arg2="${buildId}" />
</condition>
<condition property="frameworkperfargs" value="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config} -Declipse.perf.assertAgainst=${eclipse.perf.assertAgainst}" else="-Declipse.perf.dbloc=${eclipse.perf.dbloc} -Declipse.perf.config=${eclipse.perf.config}">

Back to the top