[llvm-commits] CVS: nightlytest-serverside/ProgramResults.php

[Jim Laskey]

Changes in directory nightlytest-serverside:

ProgramResults.php updated: 1.67 -> 1.68
---
Log message:

Debugging #11

---
Diffs of the changes:  (+8 -8)

 ProgramResults.php |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)


Index: nightlytest-serverside/ProgramResults.php
diff -u nightlytest-serverside/ProgramResults.php:1.67 nightlytest-serverside/ProgramResults.php:1.68
--- nightlytest-serverside/ProgramResults.php:1.67	Sat Sep 16 19:54:09 2006
+++ nightlytest-serverside/ProgramResults.php	Sat Sep 16 19:58:30 2006
@@ -614,14 +614,14 @@
  *
  * Returns a hash of tests that fail for a given night.
  */
-function getTestFailSet($id, $table){
+function getTestFailSet($id){
   $test_hash = array();
-  $query = "SELECT program, result FROM $table WHERE night=$id";
+  $query = "SELECT program, result, measure FROM tests WHERE night=$id ORDER BY program ASC, measure ASC";
   $program_query = mysql_query($query) or die (mysql_error());
   while ($row = mysql_fetch_assoc($program_query)) {
     $result = $row['result'];
     if (!isTestPass($result)) {
-      $program = rtrim($row['program'], ": ");
+      $program = MergeNameAndMeasureFromRow($row);
       $test_hash[$program] = $result;
     }
   }
@@ -637,15 +637,15 @@
  */
 function getPassingTests($id, $table, $test_hash){
   $result = "";
-  $query = "SELECT program, result FROM $table WHERE night=$id ORDER BY program ASC";
+  $query = "SELECT program, result, measure FROM tests WHERE night=$id ORDER BY program ASC, measure ASC";
   $program_query = mysql_query($query) or die (mysql_error());
   while ($row = mysql_fetch_assoc($program_query)) {
-    $program = rtrim($row['program'], ": ");
+    $program = MergeNameAndMeasureFromRow($row);
+    $result = $row['result'];
     $wasfailing = isset($test_hash[$program]);
-    $ispassing = isTestPass($row['result']);
+    $ispassing = isTestPass($result);
     if ($wasfailing && $ispassing) {
-      $reasons = getFailReasons($test_hash[$program]);
-      $result .= trimTestPath($program) . $reasons . "\n";
+      $result .= $program . "\n";
     }
   }
   mysql_free_result($program_query);