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

[Jim Laskey]

Changes in directory nightlytest-serverside:

ProgramResults.php updated: 1.41 -> 1.42
---
Log message:

reuse code for e-mail report #3

---
Diffs of the changes:  (+5 -4)

 ProgramResults.php |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)


Index: nightlytest-serverside/ProgramResults.php
diff -u nightlytest-serverside/ProgramResults.php:1.41 nightlytest-serverside/ProgramResults.php:1.42
--- nightlytest-serverside/ProgramResults.php:1.41	Fri Sep  8 14:22:55 2006
+++ nightlytest-serverside/ProgramResults.php	Fri Sep  8 14:33:51 2006
@@ -426,7 +426,7 @@
     $query = "SELECT * FROM tests WHERE night=$night_id AND result=\"FAIL\" ORDER BY program ASC";
     $program_query = mysql_query($query) or die (mysql_error());
     while($row = mysql_fetch_array($program_query)) {
-      $result .= $row['program'] . "<br>\n";
+      $result .= $row['program'] . "\n";
     }
     mysql_free_result($program_query);
 
@@ -436,11 +436,12 @@
       $test_result = $row['result'];
       if (!isTestPass($test_result)) {
         $reasons = getFailReasons($test_result);        
-        $result .= "{$row['program']}{$reasons}<br>\n";
+        $result .= "{$row['program']}{$reasons}\n";
       }
     }
     mysql_free_result($program_query);
   }
+  $result = htmlifyTestResults($result);
   return $result;
 }
 
@@ -457,17 +458,17 @@
     $program_query = mysql_query($query) or die (mysql_error());
     $row = mysql_fetch_array($program_query);
     $result= $row['unexpfail_tests'];
-    $result=preg_replace("/\n/","<br>\n",$result);
     mysql_free_result($program_query);
   }
   else{
     $query = "SELECT * FROM tests WHERE night=$night_id AND result=\"FAIL\"";
     $program_query = mysql_query($query) or die (mysql_error());
     while($row = mysql_fetch_array($program_query)){
-      $result .= $row['program'] . "<br>\n";
+      $result .= $row['program'] . "\n";
     }
     mysql_free_result($program_query);
   }
+  $result = htmlifyTestResults($result);
   return $result;
 }