From c764403a2bade954f489bb9c02c92ee2be914a9a Mon Sep 17 00:00:00 2001
From: David Williams
Date: Thu, 7 Aug 2014 23:56:02 -0400
Subject: [releng] corrections and simplification of initial "related links"
(test results) section discoverd when using "overrideTestColor" for M1.
---
.../templateFiles/index.php.template | 75 +++++++++++-----------
1 file 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 fe114e907..f44ecec90 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 "
\n";
+ echo "- ".$boxesDisplay." of ".count($expectedTestConfigs)." test configurations are complete.
\n";
+ foreach ($expectedTestConfigs as $config) {
echo "\n";
- echo "- ".$boxes." of ".count($expectedTestConfigs)." test configurations are complete.
\n";
- foreach ($expectedTestConfigs as $config) {
- echo "\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 "- \n";
- echo "".$config."";
- echo " (Failed: ".$failed." Passed: ".$passed." Skipped: ".$skipped." Total: ".$total." Total test time: ".$duration.")\n";
- echo "
\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 "- \n";
- echo "".$config."";
- echo "
\n";
- }
- echo "
\n";
- }
+ }
+ // display as list for now. Probably table later.
+ echo "- \n";
+ echo "".$config."";
+ echo " (Failed: ".$failed." Passed: ".$passed." Skipped: ".$skipped." Total: ".$total." Total test time: ".$duration.")\n";
+ echo "
\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 "- \n";
+ echo "".$config."";
+ echo "
\n";
+ }
echo "
\n";
- }
+ }
+ echo "
\n";
// if (file_exists("performance/performance.php")) {
--
cgit v1.2.3