diff options
author | David Williams | 2014-11-11 13:11:38 +0000 |
---|---|---|
committer | David Williams | 2014-11-11 13:11:38 +0000 |
commit | ba6e31f43af5c5732ef3a4504858dca2f8ec82f2 (patch) | |
tree | a6ad9ae7b06fc03bcd2a114ca31d8d30c6d9ee26 /production/testScripts/genTestIndexes.xml | |
parent | 983f7b3e66b7a7701bd97a275daef02624e5f1a5 (diff) | |
download | eclipse.platform.releng.aggregator-ba6e31f43af5c5732ef3a4504858dca2f8ec82f2.tar.gz eclipse.platform.releng.aggregator-ba6e31f43af5c5732ef3a4504858dca2f8ec82f2.tar.xz eclipse.platform.releng.aggregator-ba6e31f43af5c5732ef3a4504858dca2f8ec82f2.zip |
Revert "Bug 444243 - Improve scripts to handle performance tests."
Still "not right" and would be better off not trying to fix, for I
build, and just avoid, for now.
This reverts commit 983f7b3e66b7a7701bd97a275daef02624e5f1a5.
Diffstat (limited to 'production/testScripts/genTestIndexes.xml')
-rw-r--r-- | production/testScripts/genTestIndexes.xml | 74 |
1 files changed, 26 insertions, 48 deletions
diff --git a/production/testScripts/genTestIndexes.xml b/production/testScripts/genTestIndexes.xml index 47a7e780e..a402d1fd5 100644 --- a/production/testScripts/genTestIndexes.xml +++ b/production/testScripts/genTestIndexes.xml @@ -11,10 +11,7 @@ <fail unless="eclipseStream" /> <fail unless="job" /> - <property - name="isBuildTested" - value="true" /> - + <script language="javascript"> <![CDATA[ var buildId = project.getProperty("buildId"); @@ -49,14 +46,6 @@ <property name="postingDirectory" value="${buildRoot}/siteDir/eclipse/downloads/${dropsDirXSegment}" /> - - <condition - property="resultLocation" - value="${postingDirectory}/${buildLabel}/performance/baseline"> - <contains - string="${job}" - substring="-baseline" /> - </condition> <condition property="resultLocation" value="${postingDirectory}/${buildLabel}/performance" @@ -65,9 +54,6 @@ string="${job}" substring="-perf-" /> </condition> - <property - name="result" - value="${resultLocation}" /> <!-- Note: results template is selected based on conventions used in hudson jobs names. Should move to properties saved in during test run? @@ -103,7 +89,6 @@ substring="-perf-" /> </and> </condition> - <condition property="testManifestFileName" value="${publishingContent}/performanceTestManifest.xml" @@ -116,14 +101,9 @@ </and> </condition> - <echo message="= = Properties in genTestIndexes.xml, init = = " /> - <echo message=" job: ${job}" /> - <echo message=" postingDirectory" /> - <echo message=" testTemplate: ${testTemplate}" /> - <echo message=" resultLocation: ${resultLocation}" /> - <echo message=" result: ${result}" /> - <echo message=" isBuildTested: ${isBuildTested}" /> - + <echo message="= = Properties in genTestIndexes.xml = = " /> + <echo message="job: ${job}" /> + <echo message="testTemplate: ${testTemplate}" /> @@ -164,10 +144,7 @@ name="generateEclipseIndex" depends="init"> - <property - name="generatorClass" - value="org.eclipse.releng.generators.EclipseTestResultsGeneratorNoMail" /> -<!-- to be removed + <condition property="generatorClass" value="org.eclipse.releng.generators.EclipseTestResultsGeneratorNoMail"> @@ -178,8 +155,8 @@ <property name="generatorClass" value="org.eclipse.releng.generators.EclipseTestResultsGenerator" /> ---> - <echo message=" DEBUG: generatorClass: ${generatorClass}" /> + + <echo message="DEBUG: generatorClass: ${generatorClass}" /> <available classname="${generatorClass}" property="class" @@ -189,7 +166,9 @@ name="genTestIndexesdropTokenList" value="%sdk%,%tests%,%example%,%rcpruntime%,%rcpsdk%,%deltapack%,%runtime%,%jdt%,%jdtsdk%,%jdtc%,%pde%,%pdesdk%,%cvs%,%cvssdk%,%swt%,%relengtools%" /> - + <property + name="isBuildTested" + value="true" /> <property name="dropTokenList" value="${genTestIndexesdroptTokenList}" /> @@ -197,26 +176,22 @@ name="platformIdentifierToken" value="%platform%" /> - <property name="indexFileName" value="index.php" /> - + <property + name="result" + value="${postingDirectory}/${buildId}" /> <property name="testResultsTemplateFileName" value="${publishingContent}/templateFiles/${testTemplate}" /> <property name="dropTemplateFileName" value="${publishingContent}/templateFiles/index.php.template" /> - - <fail - unless="testManifestFileName" - message="testManifestFileName should have been defined, by now?" /> - <!-- to be removed <property name="testManifestFileName" value="${publishingContent}/testManifest.xml" /> - --> + <antcall target="publishEclipseIndex"> </antcall> @@ -227,30 +202,33 @@ depends="init"> - <fail unless="buildType" message="buildType should have been defined by now" /> - <fail unless="result" message="result should have been defined by now" /> - <!--regenerate the index page with links to test results --> <ant antfile="${EBuilderDir}/eclipse/buildScripts/publish.xml" dir="${publishingContent}" target="generateIndex"> - + <property + name="isBuildTested" + value="true" /> + <property + name="buildType" + value="${buildType}" /> <property name="dropTokenList" value="%sdk%,%tests%,%example%,%rcpruntime%,%rcpsdk%,%deltapack%,%runtime%,%jdt%,%jdtsdk%,%jdtc%,%pde%,%pdesdk%,%cvs%,%cvssdk%,%swt%,%relengtools%" /> <property name="platformIdentifierToken" value="%platform%" /> - - <property - name="testResultsTemplateFileName" - value="${publishingContent}/templateFiles/${testTemplate}" /> - <property name="indexFileName" value="index.php" /> <property + name="result" + value="${resultLocation}" /> + <property + name="testResultsTemplateFileName" + value="${publishingContent}/templateFiles/${testTemplate}" /> + <property name="dropTemplateFileName" value="${publishingContent}/templateFiles/index.php.template" /> <property |