Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2014-08-07 23:56:02 -0400
committerDavid Williams2014-08-07 23:56:02 -0400
commitc764403a2bade954f489bb9c02c92ee2be914a9a (patch)
treeca4283aa8e41cf5778bdd50b46a1faf9ed61b8ce
parent44ac58d146dce347e9e9ab133bc8714f1764807a (diff)
downloadeclipse.platform.releng.aggregator-c764403a2bade954f489bb9c02c92ee2be914a9a.tar.gz
eclipse.platform.releng.aggregator-c764403a2bade954f489bb9c02c92ee2be914a9a.tar.xz
eclipse.platform.releng.aggregator-c764403a2bade954f489bb9c02c92ee2be914a9a.zip
[releng] corrections and simplification of initial "related links" (test
results) section discoverd when using "overrideTestColor" for M1.
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template75
1 files changed, 37 insertions, 38 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
index fe114e90..f44ecec9 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
@@ -253,48 +253,47 @@ relating to its results and unit tests.
} else {
$boxesDisplay = $boxes;
+ echo "<ul>\n";
+ echo "<li>".$boxesDisplay." of ".count($expectedTestConfigs)." test configurations are complete.</li>\n";
+ foreach ($expectedTestConfigs as $config) {
echo "<ul>\n";
- echo "<li>".$boxes." of ".count($expectedTestConfigs)." test configurations are complete.</li>\n";
- foreach ($expectedTestConfigs as $config) {
- echo "<ul>\n";
- if (isset($testResults[$config])) {
- $testRes = $testResults[$config];
- $failed = $testRes['failCount'];
- $passed = $testRes['passCount'];
- $skipped = $testRes['skipCount'];
- $total = $failed + $passed + $skipped;
- $duration = $testRes['duration'];
- if (file_exists("overrideTestColor")) {
+ if (isset($testResults[$config])) {
+ $testRes = $testResults[$config];
+ $failed = $testRes['failCount'];
+ $passed = $testRes['passCount'];
+ $skipped = $testRes['skipCount'];
+ $total = $failed + $passed + $skipped;
+ $duration = $testRes['duration'];
+ if (file_exists("overrideTestColor")) {
+ $linkColor='green';
+ }
+ else {
+ if ($failed > 0) {
+ // note we don't override 'inherit' cases, just 'failed'.
+ if (file_exists("overrideTestColor")) {
+ $linkColor='green';
+ } else {
+ $linkColor = 'red';
+ }
+ } else {
$linkColor='green';
}
- else {
- if ($failed > 0) {
- // note we don't override 'inherit' cases, just 'failed'.
- if (file_exists("overrideTestColor")) {
- $linkColor='green';
- } else {
- $linkColor = 'red';
- }
- } else {
- $linkColor='green';
- }
- }
- // display as list for now. Probably table later.
- echo "<li>\n";
- echo "<a style=\"color:${linkColor};text-decoration:none\" href=\"testResults.php\">".$config."</a>";
- echo " (Failed: ".$failed." Passed: ".$passed." Skipped: ".$skipped." Total: ".$total." Total test time: ".$duration.")\n";
- echo "</li>\n";
- }
- else {
- // Yes, all configs intentionally links, since all go to the same palce, but if no results yet, would not look like one.
- echo "<li>\n";
- echo "<a style=\"color:inherit;text-decoration:none\" href=\"testResults.php\">".$config."</a>";
- echo "</li>\n";
- }
- echo "</ul>\n";
- }
+ }
+ // display as list for now. Probably table later.
+ echo "<li>\n";
+ echo "<a style=\"color:${linkColor};text-decoration:none\" href=\"testResults.php\">".$config."</a>";
+ echo " (Failed: ".$failed." Passed: ".$passed." Skipped: ".$skipped." Total: ".$total." Total test time: ".$duration.")\n";
+ echo "</li>\n";
+ }
+ else {
+ // Yes, all configs intentionally links, since all go to the same palce, but if no results yet, would not look like one.
+ echo "<li>\n";
+ echo "<a style=\"color:inherit;text-decoration:none\" href=\"testResults.php\">".$config."</a>";
+ echo "</li>\n";
+ }
echo "</ul>\n";
- }
+ }
+ echo "</ul>\n";
// if (file_exists("performance/performance.php")) {

Back to the top