Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2016-05-31 01:25:11 +0000
committerDavid Williams2016-05-31 01:27:27 +0000
commitb84eb935ec6f3bbb8f740e85fcc2a4a326d9d7d8 (patch)
treee5b6cfe787f4db037cfea0621810968559628650
parentc3a81b920a563c49171366c5dd7b7bce6bc0a05b (diff)
downloadeclipse.platform.releng.aggregator-b84eb935ec6f3bbb8f740e85fcc2a4a326d9d7d8.tar.gz
eclipse.platform.releng.aggregator-b84eb935ec6f3bbb8f740e85fcc2a4a326d9d7d8.tar.xz
eclipse.platform.releng.aggregator-b84eb935ec6f3bbb8f740e85fcc2a4a326d9d7d8.zip
Bug 494538 - generation of index.php page is not quite right
Plus Bug 491052 - Performance Unit tests results are not displayed
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml10
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/eclipse_compare.xml8
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/eclipse_convert.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml104
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml95
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/perfBaselineResults.php139
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/performance.php60
-rwxr-xr-xproduction/build-functions.shsource12
-rwxr-xr-xproduction/publish-eclipse.sh4
9 files changed, 210 insertions, 224 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml
index ff83a89ac..dde9aad0c 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml
@@ -28,7 +28,7 @@
<!-- make a dir to place the XML and HTML output in, per build -->
<property
name="report"
- value="${buildDirectory}/${buildLabel}/apitools" />
+ value="${buildDirectory}/apitools" />
<mkdir dir="${report}" />
<property
name="freeze_report"
@@ -59,7 +59,7 @@
<!-- create the Ant filterstore directory -->
<property
name="filter_store"
- value="${buildDirectory}/${buildLabel}/apifilters" />
+ value="${buildDirectory}/apifilters" />
<mkdir dir="${filter_store}" />
<!-- copy all of the .api_filters files out of the plugins from their source -->
@@ -158,7 +158,7 @@
<!-- a dir to extract previous baselines in ... remember not to copy apitoolingreference to downloads -->
<property
name="reference"
- value="${buildDirectory}/${buildLabel}/apitoolingreference/${previousBaselineName}" />
+ value="${buildDirectory}/apitoolingreference/${previousBaselineName}" />
<mkdir dir="${reference}" />
<get
@@ -185,7 +185,7 @@
<!-- grab the currently built + zipped build -->
<property
name="current_location"
- value="${buildDirectory}/${buildLabel}/eclipse-SDK-${buildLabel}-win32.zip" />
+ value="${buildDirectory}/eclipse-SDK-${buildLabel}-win32.zip" />
<!--
If not available, build failed, for other reasons, so we'll prevent
errors from occuring here, which might be confusing in debugging.
@@ -210,7 +210,7 @@
<property
name="freezereference"
- value="${buildDirectory}/${buildLabel}/apitoolingreference/${freezeName}" />
+ value="${buildDirectory}/apitoolingreference/${freezeName}" />
<mkdir dir="${freezereference}" />
<get
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/eclipse_compare.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/eclipse_compare.xml
index d57793649..35dfbb173 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/eclipse_compare.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/eclipse_compare.xml
@@ -11,10 +11,10 @@
we get these properties so we can print out the repository
used by comparator, 'comparator.repo'.
-->
- <loadproperties srcfile="${buildDirectory}/${buildId}/mavenproperties.properties" />
+ <loadproperties srcfile="${buildDirectory}/mavenproperties.properties" />
<!--create html output for compile logs -->
<comparatorSummary
- builddirectory="${buildDirectory}/${buildId}"
+ builddirectory="${buildDirectory}"
comparatorRepo="${comparator.repo}" />
</target>
<target
@@ -22,7 +22,7 @@
depends="init"
unless="propertyFileAvailable">
<echo message="WARNING: eclipse_compare not performed since property file did not exist: " />
- <echo message=" ${buildDirectory}/${buildId}/mavenproperties.properties" />
+ <echo message=" ${buildDirectory}/mavenproperties.properties" />
</target>
<target
name="init"
@@ -33,7 +33,7 @@
the explicit check here has advantage of avoiding error messages in error log.
-->
<available
- file="${buildDirectory}/${buildId}/mavenproperties.properties"
+ file="${buildDirectory}/mavenproperties.properties"
property="propertyFileAvailable" />
<property
name="eclipse_compare.initialized"
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/eclipse_convert.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/eclipse_convert.xml
index 262b84574..f3e791033 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/eclipse_convert.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/eclipse_convert.xml
@@ -7,7 +7,7 @@
<echo message="Checking for compile errors..." />
<!--create html output for compile logs -->
<eclipse.convert
- input="${buildDirectory}/compilelogs"
+ input="${buildDirectory}/compilelogs/plugins/"
validation="true" />
</target>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
index 34bed6ea1..e0f72dd85 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/publish.xml
@@ -8,10 +8,45 @@
buildId: Build name
buildLabel: <buildType>-<buildName>-<timestamp>
-->
+ <fail
+ if="result"
+ message="the value result was passed in as publish.xml started. As if someone was overriding buildDirectory?" />
+ <fail
+ if="dropDirectory"
+ message="the value dropDirectory was passed in as publish.xml started. But we expect to compute it." />
+
+ <fail
+ unless="buildDirectory"
+ message="buildDirectory must be defined for publish.xml " />
+
+ <fail
+ unless="buildLabel"
+ message="buildLabel must be defined for publish.xml" />
+ <!-- this is the "top" of the drop directory
+ It is used internal to this script to define
+ the "real" dropDirecotry. Sometimes equal to this root,
+ but for tests, will be one level lower, such as testResult (for unit tests),
+ performance (for main stream performance tests), or baseline (for baseline
+ performance tests).
+ -->
<property
- name="result"
- value="${buildDirectory}" />
+ name="dropDirectoryName"
+ value="${postingDirectory}/${buildLabel}" />
+
+ <condition property="notRedundantDir">
+ <not>
+ <equals
+ arg1="${buildDirectory}"
+ arg2="${dropDirectoryName}" />
+ </not>
+ </condition>
+ <echo message="== buildDirectory: ${line.separator}==${buildDirectory}" />
+ <echo message="== dropDirectoryName: ${line.separator}==${dropDirectoryName}" />
+
+ <fail
+ if="notRedundantDir"
+ message="buildDirectory and dropDirectoryName are surpisingly NOT equal. Caller has passed in wrong value." />
<target name="default">
<antcall target="getStaticFiles" />
@@ -52,14 +87,14 @@
<!-- xml results directory -->
<condition
property="xmlDirectoryName"
- value="${result}/baseline/xml">
+ value="${buildDirectory}/baseline/xml">
<contains
string="${job}"
substring="-baseline" />
</condition>
<condition
property="xmlDirectoryName"
- value="${result}/performance/xml">
+ value="${buildDirectory}/performance/xml">
<contains
string="${job}"
substring="-perf-" />
@@ -67,7 +102,7 @@
<!-- else standard default for unit tests -->
<property
name="xmlDirectoryName"
- value="${result}/testresults/xml" />
+ value="${buildDirectory}/testresults/xml" />
<condition
property="indexFileName"
@@ -110,8 +145,8 @@
string="${job}"
substring="-unit-" />
</condition>
- <!-- else standard default for download page -->
-<property
+ <!-- else standard default for download index.php page -->
+ <property
name="dropTemplateFileName"
value="${basedir}/templateFiles/index.template.php" />
@@ -124,12 +159,23 @@
substring="-perf-" />
</condition>
-
- <property
- name="dropDirectoryName"
- value="${postingDirectory}/${buildLabel}" />
-
-
+ <condition
+ property="expectedConfigFilename"
+ value="perfTestConfigs.php"
+ else="testConfigs.php">
+ <contains
+ string="${job}"
+ substring="-perf-" />
+ </condition>
+ <condition
+ property="foundConfigFilename"
+ value="perfTestConfigsFound.php"
+ else="testConfigsFound.php">
+ <contains
+ string="${job}"
+ substring="-perf-" />
+ </condition>
+
<condition
property="testResultsHtmlFileName"
value="baselineResultsTable.php">
@@ -151,14 +197,10 @@
string="${job}"
substring="-unit-" />
</condition>
- <!-- "fake" file that should not hurt anything, but may be published,
- when doing ONLY the download page?
- TODO: should be a "<fail" or "undefined" here, but may depend on
- custom ant task, so we'll take the safe approach first.
- -->
+ <!-- is this used by indexer or hard coded? -->
<property
name="testResultsHtmlFileName"
- value="noValidJobInPublishXML.html" />
+ value="testResultsTables.html" />
<condition
property="hrefTestResultsTargetPath"
@@ -181,30 +223,22 @@
string="${job}"
substring="-unit-" />
</condition>
- <!-- "fake" dir that should not hurt anything, but may be published,
- when doing ONLY the download page?
- TODO: should be a "<fail" or "undefined" here, but may depend on
- custom ant task, so we'll take the safe approach first.
- -->
<property
- name="hrefTestResultsTargetPath"
- value="nohrefTestResultsTargetPathDefined" />
+ name="testResultsHtmlFileName"
+ value="testresults" />
<!-- we should be able to do this now, and refine list in manifest. -->
<property
name="doMissingListValue"
value="true" />
- <!--
- <property
- name="hrefTestResultsTargetPath"
- value="${result}" />
- -->
+
+ <!-- it is surprising these are defined here? -->
<property
name="hrefCompileLogsTargetPath"
value="compilelogs/plugins/" />
<property
name="compileLogsDirectoryName"
- value="${dropDirectoryName}/compilelogs/plugins" />
+ value="${buildDirectory}/${hrefCompileLogsTargetPath}" />
<property
name="testManifestFileName"
value="${manifestFile}" />
@@ -245,7 +279,7 @@
<echo message=" = = properties in publish.xml == " />
<echo message=" job: ${job}" />
- <echo message=" result: ${result}" />
+ <echo message=" buildDirectory: ${buildDirectory}" />
<echo message=" xmlDirectoryName: ${xmlDirectoryName}" />
<echo message=" dropDirectoryName ${dropDirectoryName}" />
<echo message=" dropTemplateFileName: ${dropTemplateFileName}" />
@@ -273,6 +307,8 @@
compileLogsDirectoryName="${compileLogsDirectoryName}"
testManifestFileName="${testManifestFileName}"
testsConfigExpected="${testsConfigExpected}"
+ expectedConfigFilename="${expectedConfigFilename}"
+ foundConfigFilename="${foundConfigFilename}"
doMissingList="${doMissingListValue}" />
</target>
@@ -280,7 +316,7 @@
<target name="getStaticFiles">
<!--get static files required in the buildLabel directory -->
- <copy todir="${result}">
+ <copy todir="${buildDirectory}">
<fileset dir="staticDropFiles" />
</copy>
</target>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
index 09dab7634..3098e807e 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
@@ -12,22 +12,15 @@
unless="AGGR_DIR"
message="AGGR_DIR must be defined for this this script" />
- <mkdir dir="${postingDirectory}/${buildLabel}/checksum" />
+ <mkdir dir="${buildDirectory}/checksum" />
<exec
executable="/bin/bash"
- dir="${postingDirectory}/${buildLabel}">
+ dir="${buildDirectory}">
<arg line="${EBuilderDir}/eclipse/extras/produceChecksum.sh" />
</exec>
- <!--post clickThroughs -->
- <copy todir="${postingDirectory}/${buildLabel}">
- <fileset
- dir="${EBuilderDir}/eclipse"
- includes="clickThroughs/" />
- </copy>
-
<!--get static files required in the buildLabel directory -->
- <copy todir="${postingDirectory}/${buildLabel}">
+ <copy todir="${buildDirectory}">
<fileset dir="${publishingContent}/staticDropFiles" />
</copy>
@@ -42,32 +35,32 @@
-->
<copy
file="${AGGR_DIR}/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/target/doc.bin.log"
- tofile="${postingDirectory}/${buildLabel}/compilelogs/platform.doc.isv.javadoc.txt"
+ tofile="${buildDirectory}/compilelogs/platform.doc.isv.javadoc.txt"
failonerror="false"
quiet="true" />
<copy
file="${AGGR_DIR}/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/target/doc.bin.log"
- tofile="${postingDirectory}/${buildLabel}/compilelogs/jdt.doc.isv.javadoc.txt"
+ tofile="${buildDirectory}/compilelogs/jdt.doc.isv.javadoc.txt"
failonerror="false"
quiet="true" />
<copy
file="${AGGR_DIR}/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/target/doc.bin.log"
- tofile="${postingDirectory}/${buildLabel}/compilelogs/pde.doc.user.javadoc.txt"
+ tofile="${buildDirectory}/compilelogs/pde.doc.user.javadoc.txt"
failonerror="false"
quiet="true" />
<copy
file="${AGGR_DIR}/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/target/platformconvert.txt"
- tofile="${postingDirectory}/${buildLabel}/compilelogs/platform.doc.isv.schema.txt"
+ tofile="${buildDirectory}/compilelogs/platform.doc.isv.schema.txt"
failonerror="false"
quiet="true" />
<copy
file="${AGGR_DIR}/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/target/jdtconvert.txt"
- tofile="${postingDirectory}/${buildLabel}/compilelogs/jdt.doc.isv.schema.txt"
+ tofile="${buildDirectory}/compilelogs/jdt.doc.isv.schema.txt"
failonerror="false"
quiet="true" />
<copy
file="${AGGR_DIR}/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/target/pdeconvert.txt"
- tofile="${postingDirectory}/${buildLabel}/compilelogs/pde.doc.user.schema.txt"
+ tofile="${buildDirectory}/compilelogs/pde.doc.user.schema.txt"
failonerror="false"
quiet="true" />
<echo message="[DEBUG] Eclipse helper.xml publish ending normally" />
@@ -93,6 +86,23 @@
string="${job}"
substring="-perf-" />
</condition>
+ <condition
+ property="manifestFile"
+ value="${publishingContent}/testManifest.xml">
+ <contains
+ string="${job}"
+ substring="-unit-" />
+ </condition>
+
+ <property
+ name="manifestFile"
+ value="${publishingContent}/testManifest.xml" />
+ <echo
+ message="[DEBUG] job is undefined which is normal when doing initial publish (before tests run). Set to normal testManifest file (to hold logs, etc.)." />
+
+ <fail
+ unless="buildType"
+ message="buildType must be defined to generateIndex before calling publish.xml" />
<!--regenerate the index page with links to test results -->
<ant
@@ -102,16 +112,11 @@
<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="result"
- value="${postingDirectory}/${buildLabel}" />
+
<property
name="testManifestFileName"
value="${manifestFile}" />
@@ -126,10 +131,10 @@
<echo message="DEBUG: in helper.xml: Checking for compile errors..." />
<!--create html output for compile logs -->
<eclipse.convert
- input="${postingDirectory}/${buildLabel}/compilelogs"
+ input="${buildDirectory}/compilelogs/plugins"
validation="true" />
<!-- Sends email to recipient list in monitor.properties with compile logs attached if errors found -->
- <!-- <verifyCompile install="${postingDirectory}/${buildLabel}/compilelogs" /> -->
+ <!-- <verifyCompile install="${buildDirectory}/compilelogs/pugins" /> -->
</target>
<target name="init">
@@ -159,42 +164,16 @@
name="publishingContent"
value="${EBuilderDir}/eclipse/publishingFiles" />
- <!-- these conditions used to be in "ant" call, but
- ant does not support "nested conditions" so we simply
- set the property here in init -->
- <condition
- property="testsConfigExpected"
- value="ep46${buildType}-perf-lin64_8.0">
- <contains
- string="${job}"
- substring="ep46${buildType}-perf-lin64" />
- </condition>
- <condition
- property="testsConfigExpected"
- value="ep46${buildType}-perf-lin64-baseline_8.0">
- <contains
- string="${job}"
- substring="ep46${buildType}-perf-lin64-baseline" />
- </condition>
- <condition
- property="testsConfigExpected"
- value="ep46${buildType}LR-perf-lin64_8.0">
- <contains
- string="${job}"
- substring="ep46${buildType}LR-perf-lin64" />
- </condition>
- <condition
- property="testsConfigExpected"
- value="ep46${buildType}LR-perf-lin64-baseline_8.0">
- <contains
- string="${job}"
- substring="ep46${buildType}LR-perf-lin64-baseline" />
- </condition>
- <!-- else normal unit tests configs -->
+ <fail
+ unless="buildLabel"
+ message="buildLabel must be passed in to helper.xml" />
+
<property
- name="testsConfigExpected"
- value="ep46${buildType}-unit-lin64_linux.gtk.x86_64_8.0,ep46${buildType}-unit-mac64_macosx.cocoa.x86_64_8.0,ep46${buildType}-unit-win32_win32.win32.x86_8.0,ep46${buildType}-unit-cen64_linux.gtk.x86_64_8.0" />
+ name="buildDirectory"
+ value="${postingDirectory}/${buildLabel}" />
+ <!-- should already exist ... but, just in case not ... -->
+ <mkdir dir="${buildDirectory}" />
</target>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/perfBaselineResults.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/perfBaselineResults.php
index 1e4148f3c..aab22783b 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/perfBaselineResults.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/perfBaselineResults.php
@@ -1,101 +1,65 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
<?php
+
+include_once("buildproperties.php");
+include_once("utilityFunctions.php");
+include ("perfTestConfigs.php");
+# Begin: page-specific settings.
+$pageTitle = "Test Results for $BUILD_ID";
+$pageKeywords = "eclipse,project,plug-ins,plugins,java,ide,swt,refactoring,free java ide,tools,platform,open source,development environment,development,ide";
+$pageAuthor = "David Williams and Christopher Guindon";
+
//ini_set("display_errors", "true");
//error_reporting (E_ALL);
-include ('buildproperties.php');
-include ('perfTestConfigs.php');
-if (array_key_exists("SERVER_NAME", $_SERVER)) {
- $servername = $_SERVER["SERVER_NAME"];
- if ($servername === "build.eclipse.org") {
- $imagesource="http://download.eclipse.org/eclipse.org-common/themes/Phoenix/images";
- $csssource="http://download.eclipse.org/eclipse.org-common//themes/Phoenix/css";
- $appsource="/home/data/httpd/download.eclipse.org/eclipse.org-common/system";
- $clickthroughstr="";
- }
- else {
- $imagesource="../../../eclipse.org-common/stylesheets";
- $csssource="../../../eclipse.org-common/stylesheets";
- $appsource="../../../eclipse.org-common/system";
- $clickthroughstr="download.php?dropFile=";
-
- }
-}
-else {
- $servername = "localhost";
- $imagesource="http://download.eclipse.org/eclipse.org-common/themes/Phoenix/images";
- $csssource="http://download.eclipse.org/eclipse.org-common//themes/Phoenix/css";
- $appsource="NONE";
- $clickthroughstr="";
-}
-?>
-<head>
-<?php
+ob_start();
- echo "<title>Test Results for $BUILD_ID Performance Unit Tests</title>";
-?>
+/*
+DL.thin.header.php.html was original obtained from
+wget https://eclipse.org/eclipse.org-common/themes/solstice/html_template/thin/header.php
+
+and then that file modified to suit our needs.
+Occasionally, our version should be compared to the "standard" to see if anything has
+changed, in the interest of staying consistent.
+
+See https://eclipse.org/eclipse.org-common/themes/solstice/docs/
+
+ */
+$endingBreadCrumbs="<li><a href=\"../$BUILD_DIR_SEG/\">$BUILD_ID</a></li><li class=\"active\">Test Results</li>";
+
+require("DL.thin.header.php.html");
+
+?>
-<STYLE TYPE="text/css">
-<!--
-P {text-indent: 30pt; margin: inherit}
--->
-</STYLE>
-
-
-<title>Drop Test Results</title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <meta name="author" content="Eclipse Foundation, Inc." />
- <meta name="keywords" content="eclipse,project,plug-ins,plugins,java,ide,swt,refactoring,free java ide,tools,platform,open source,development environment,development,ide" />
- <link rel="stylesheet" type="text/css" href="<?php echo $csssource;?>/visual.css" media="screen" />
- <link rel="stylesheet" type="text/css" href="<?php echo $csssource;?>/layout.css" media="screen" />
- <link rel="stylesheet" type="text/css" href="<?php echo $csssource;?>/print.css" media="print" />
- <script type="text/javascript">
-
-sfHover = function() {
- var sfEls = document.getElementById("leftnav").getElementsByTagName("LI");
- for (var i=0; i<sfEls.length; i++) {
- sfEls[i].onmouseover=function() {
- this.className+=" sfhover";
- }
- sfEls[i].onmouseout=function() {
- this.className=this.className.replace(new RegExp(" sfhover\\b"), "");
- }
- }
-}
-if (window.attachEvent) window.attachEvent("onload", sfHover);
-</script>
-</head>
-<body>
<?php if (! isset ($BUILD_FAILED) ) { ?>
-<div id="leftcol">
-<ul id="leftnav">
+<aside class="col-md-6" id="leftcol" style="margin-top:20px;" >
+<ul class="ul-left-nav fa-ul hidden-print" style="text-color:black; background-color:#EFEBFF; background-size:contain; background-clip:border-box; border-color: black; font-size:12px; font-weight:bold; padding:2px; line-height:1; border-radius: 1; margin:20px 3px 20px 3px">
<li><a href="#Logs">Logs</a></li>
<li><a href="#UnitTest">Performance Unit Test Results</a></li>
</ul>
+</aside>
+ <!-- end 'not build failed' -->
-</div>
-<!-- end 'not build failed' -->
-<?php } ?>
+<?php }
+
+echo "<div id=\"midcolumn\">".PHP_EOL;
+
+echo "<h1>Test Results for <a href=\"../".$BUILD_DIR_SEG."\">".$BUILD_ID."</a></h1>".PHP_EOL;
+
+echo "<h3 id=\"Logs\"> Logs for <a href=\"../".$BUILD_DIR_SEG."\">".$BUILD_ID."</a></h3>".PHP_EOL;
+echo "<ul>";
-<div id="midcolumn">
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-<div class="homeitem3col">
-<h3><a name="Logs"> Logs <?php echo "$BUILD_ID"; ?></h3>
-<ul>
<li> <a href="perfBaselinelogs.php#console"><b> Console Output Logs </b></a>
</li>
</div>
-<div class="homeitem3col">
<h3><a name="UnitTest">Performance Unit Test Results for <?php echo "$BUILD_ID"; ?> </a></h3>
<p>The table shows the unit test results for this build on the platforms
@@ -113,17 +77,7 @@ if (file_exists("testNotes.html")) {
}
?>
-<table width="85%" border="1" bgcolor="#EEEEEE" rules="groups" align="center">
-<tr bgcolor="#9999CC">
-<th rowspan="2" width="40%" align="center"> org.eclipse <br> Component </th>
-<th colspan="5" align="center"> Test Configurations </th></tr>
-<tr bgcolor="#9999CC">
-<!-- The order of the columns is "hard coded". Linux, Mac, Windows -->
-<th width="20%"><?= $expectedTestConfigs[0] ?></th>
-<th width="20%"><?= $expectedTestConfigs[1] ?></th>
-<th width="20%"><?= $expectedTestConfigs[2] ?></th>
-<th><th width="20%"></th>
-</tr>
+
<?php
$rowResultsFile="perfBaselineResultsTables.html";
if (file_exists($rowResultsFile)) {
@@ -132,9 +86,14 @@ $rowResultsFile="perfBaselineResultsTables.html";
include "testResultsTablesPending.html";
}
?>
-</table>
-</br>
-</div>
-</body>
-</html>
+</div> <!-- close resultSection -->
+</main>
+ </body>
+ </html>
+<?php
+ $html = ob_get_clean();
+
+ #echo the computed content
+ echo $html;
+?> \ No newline at end of file
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/performance.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/performance.php
index 91c8ba3f1..72b657cf4 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/performance.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/performance.php
@@ -1,14 +1,39 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://download.eclipse/eclipse/default_style.css"
- type="text/css">
-<title>Performance Results</title>
-</head>
-<body>
- <div class="homeitem3col">
-<h2 name="PerformanceResults">Performance Results</h2>
+<?php
+
+include_once("buildproperties.php");
+include_once("utilityFunctions.php");
+include("../buildproperties.php");
+include ("../perfTestConfigs.php");
+include ("perfTestConfigs.php");
+
+# Begin: page-specific settings.
+$pageTitle = "Performance Test Results for $BUILD_ID";
+$pageKeywords = "eclipse,project,plug-ins,plugins,java,ide,swt,refactoring,free java ide,tools,platform,open source,development environment,development,ide";
+$pageAuthor = "David Williams and Christopher Guindon";
+
+//ini_set("display_errors", "true");
+//error_reporting (E_ALL);
+
+
+ob_start();
+
+/*
+DL.thin.header.php.html was original obtained from
+
+wget https://eclipse.org/eclipse.org-common/themes/solstice/html_template/thin/header.php
+
+and then that file modified to suit our needs.
+Occasionally, our version should be compared to the "standard" to see if anything has
+changed, in the interest of staying consistent.
+
+See https://eclipse.org/eclipse.org-common/themes/solstice/docs/
+
+ */
+$endingBreadCrumbs="<li><a href=\"../$BUILD_DIR_SEG/\">$BUILD_ID</a></li><li class=\"active\">Test Results</li>";
+
+require("DL.thin.header.php.html");
+
+?>
<h3 name="Performancefingerprint">Performance fingerprint</h3>
<?php
@@ -91,19 +116,6 @@ if (file_exists("../baseline.php")) {
?>
-
-<table width="85%" border="1" bgcolor="#EEEEEE" rules="groups" align="center">
-<tr bgcolor="#9999CC">
-<th rowspan="2" width="40%" align="center"> org.eclipse <br> Component </th>
-<th colspan="5" align="center"> Test Configurations </th></tr>
-<tr bgcolor="#9999CC">
-<!-- The order of the columns is "hard coded". Linux, Mac, Windows -->
-<th width="20%"><?= $expectedTestConfigs[0] ?></th>
-<th width="20%"><?= $expectedTestConfigs[1] ?></th>
-<th width="20%"><?= $expectedTestConfigs[2] ?></th>
-<th><th width="20%"></th>
-</tr>
-
<?php
$rowResultsFile="performanceTables.html";
if (file_exists($rowResultsFile)) {
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 1ba9e1a3b..c56593b39 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -1072,8 +1072,8 @@ fn-parse-compile-logs ()
-data ${BUILD_DIR}/workspace-verifyCompile \
-application org.eclipse.ant.core.antRunner \
-buildfile "$ANT_SCRIPT" \
- -DbuildDirectory=$(dirname "$BUILD_DIR" ) \
- -DpostingDirectory=$(dirname "$BUILD_DIR" ) \
+ -DpostingDirectory=$(dirname $BUILD_DIR) \
+ -DbuildDirectory="$BUILD_DIR" \
-DEBuilderDir="${EBuilderDir}" \
-DbuildId="$BUILD_ID" \
-DbuildLabel="$BUILD_ID" \
@@ -1102,8 +1102,7 @@ fn-summarize-comparator-logs ()
-data ${BUILD_DIR}/workspace-comparatorLogs \
-application org.eclipse.ant.core.antRunner \
-buildfile "$ANT_SCRIPT" \
- -DbuildDirectory=$(dirname "$BUILD_DIR" ) \
- -DpostingDirectory=$(dirname "$BUILD_DIR" ) \
+ -DbuildDirectory="$BUILD_DIR" \
-DEBuilderDir="${EBuilderDir}" \
-DbuildId="$BUILD_ID" \
-DbuildLabel="$BUILD_ID" \
@@ -1147,8 +1146,7 @@ fn-summarize-apitooling ()
-data ${BUILD_DIR}/workspace-apitoolingsLogs \
-application org.eclipse.ant.core.antRunner \
-buildfile "$ANT_SCRIPT" \
- -DbuildDirectory=$(dirname "$BUILD_DIR" ) \
- -DpostingDirectory=$(dirname "$BUILD_DIR" ) \
+ -DbuildDirectory="$BUILD_DIR" \
-DEBuilderDir=$EBuilderDir \
-DbuildId="$BUILD_ID" \
-DbuildLabel="$BUILD_ID" \
@@ -1199,7 +1197,7 @@ fn-publish-eclipse ()
-DeclipseStream=$BUILD_STREAM \
-DbuildType="$BUILD_TYPE" \
-Dbase.builder=$(dirname $(dirname "$BASEBUILDER_LAUNCHER" ) ) \
- -DbuildDirectory=$(dirname "$BUILD_DIR") \
+ -DbuildDirectory="$BUILD_DIR" \
-Djava.io.tmpdir=$TMP_DIR \
publish
# hide experimental builds, for now
diff --git a/production/publish-eclipse.sh b/production/publish-eclipse.sh
index 5e3d2edd1..f0f389011 100755
--- a/production/publish-eclipse.sh
+++ b/production/publish-eclipse.sh
@@ -48,7 +48,9 @@ then
else
fn-gather-compile-logs "$BUILD_ID" "$aggDir" "$buildDirectory"
fi
-
+echo -e "\n\n[DEBUG] == critical values in publish-eclipse.sh == "
+echo -e "\n[DEBUG] buildDirectory in publish-eclipse.sh: $buildDirectory"
+echo -e "\n[DEBUG] BUILD_ID in publish-eclipse.sh: $BUILD_ID"
fn-parse-compile-logs "$BUILD_ID" \
"${EBuilderDir}/eclipse/helper.xml" \
"$buildDirectory" "$launcherJar"

Back to the top