diff options
| author | David Williams | 2014-11-02 03:24:36 +0000 |
|---|---|---|
| committer | David Williams | 2014-11-02 03:24:36 +0000 |
| commit | e856179e8c255b5dad05d060a2bdaeb0e8badf57 (patch) | |
| tree | aef0a89b5bd9fcef840f101eb17b8412d104874e /production/testScripts/runTests2.xml | |
| parent | f671c19dbc04daa7f2ad8eb159e60e70d53f0211 (diff) | |
| download | eclipse.platform.releng.aggregator-e856179e8c255b5dad05d060a2bdaeb0e8badf57.tar.gz eclipse.platform.releng.aggregator-e856179e8c255b5dad05d060a2bdaeb0e8badf57.tar.xz eclipse.platform.releng.aggregator-e856179e8c255b5dad05d060a2bdaeb0e8badf57.zip | |
Bug 390821 - Performance testing back end on eclipse.org
Diffstat (limited to 'production/testScripts/runTests2.xml')
| -rw-r--r-- | production/testScripts/runTests2.xml | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml index 6124664ab..72ae4779a 100644 --- a/production/testScripts/runTests2.xml +++ b/production/testScripts/runTests2.xml @@ -52,6 +52,18 @@ else="${buildURL}"> <istrue value="${baselinePerf}"/> </condition> + <property name="eclipse.perf.dbloc" value="${eclipse.perf.dbloc.value}"/> + <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). + --> + <condition property="eclipse.perf.assertAgainst" value="build=${baselinePerfVersion}"> + <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}"> + <isset property="eclipse.perf.assertAgainst"/> + </condition> <echo message="setRuntimeArchive os ${os} ws ${ws} arch ${arch}" /> <echo message="build id of runtimeArchive ${buildIdToUse}" /> @@ -626,18 +638,7 @@ </condition> <loadproperties srcFile="${configurationDir}/streamSpecific.properties" /> - <property name="eclipse.perf.dbloc" value="${eclipse.perf.dbloc.value}"/> - <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). - --> - <condition property="eclipse.perf.assertAgainst" value="build=${baselinePerfVersion}"> - <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}"> - <isset property="eclipse.perf.assertAgainst"/> - </condition> + <!-- echo a few typically expected properties, to make sure getting right file --> <echo message="streamSpecificPropertiesTitle: ${streamSpecificPropertiesTitle}" /> |