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

[Jim Laskey]

Changes in directory nightlytest-serverside:

ProgramResults.php updated: 1.39 -> 1.40
---
Log message:

reuse code for e-mail report #1

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

 ProgramResults.php |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


Index: nightlytest-serverside/ProgramResults.php
diff -u nightlytest-serverside/ProgramResults.php:1.39 nightlytest-serverside/ProgramResults.php:1.40
--- nightlytest-serverside/ProgramResults.php:1.39	Fri Sep  8 06:44:44 2006
+++ nightlytest-serverside/ProgramResults.php	Fri Sep  8 14:13:57 2006
@@ -500,7 +500,7 @@
   while ($row = mysql_fetch_array($program_query)) {
     $test_key = $row['program'];
     if (!isset($test_hash[$test_key])) {
-      $result .= $test_key . "<br>\n";
+      $result .= $test_key . "\n";
     }
   }
   mysql_free_result($program_query);
@@ -524,7 +524,6 @@
     $program_query = mysql_query($query) or die (mysql_error());
     $row = mysql_fetch_array($program_query);
     $result = $row['new_tests'];
-    $result = preg_replace("/\n/","<br>\n", $result);
     mysql_free_result($program_query);
   } else {
     $test_hash = getTestSet($prev_id, "tests");
@@ -533,6 +532,7 @@
     $test_hash = getTestSet($prev_id, "program");
     $result .= getExcludedTests($cur_id, "program", $test_hash);
   }
+  $result = preg_replace("/\n/","<br>\n", $result);
   return $result;
 }
 
@@ -553,7 +553,6 @@
     $program_query = mysql_query($query) or die (mysql_error());
     $row = mysql_fetch_array($program_query);
     $result = $row['removed_tests'];
-    $result = preg_replace("/\n/","<br>\n", $result);
     mysql_free_result($program_query);
   } else {
     $test_hash = getTestSet($cur_id, "tests");
@@ -562,6 +561,7 @@
     $test_hash = getTestSet($cur_id, "program");
     $result .= getExcludedTests($prev_id, "program", $test_hash);
   }
+  $result = preg_replace("/\n/","<br>\n", $result);
   return $result;
 }
 
@@ -610,7 +610,7 @@
     $test_key = $row['program'];
     if (isset($test_hash[$test_key]) && isTestPass($row['result'])) {
       $reasons = getFailReasons($test_hash[$test_key]);
-      $result .= "{$test_key}{$reasons}<br>\n";
+      $result .= "{$test_key}{$reasons}\n";
     }
   }
   mysql_free_result($program_query);
@@ -634,7 +634,6 @@
     $program_query = mysql_query($query) or die (mysql_error());
     $row = mysql_fetch_array($program_query);
     $result = $row['newly_passing_tests'];
-    $result = preg_replace("/\n/","<br>\n", $result);
     mysql_free_result($program_query);
   } else {
     $test_hash = getTestFailSet($prev_id, "tests");
@@ -643,6 +642,7 @@
     $test_hash = getTestFailSet($prev_id, "program");
     $result .= getPassingTests($cur_id, "program", $test_hash);
   }
+  $result = preg_replace("/\n/","<br>\n", $result);
   return $result;
 }
 
@@ -663,7 +663,6 @@
     $program_query = mysql_query($query) or die (mysql_error());
     $row = mysql_fetch_array($program_query);
     $result = $row['newly_failing_tests'];
-    $result = preg_replace("/\n/","<br>\n", $result);
     mysql_free_result($program_query);
   } else {
     $test_hash = getTestFailSet($cur_id, "tests");
@@ -672,6 +671,7 @@
     $test_hash = getTestFailSet($cur_id, "program");
     $result .= getPassingTests($prev_id, "program", $test_hash);
   }
+  $result = preg_replace("/\n/","<br>\n", $result);
   return $result;
 }