[llvm-commits] CVS: nightlytest-serverside/NightlyTestAccept.cgi test.php

[Jim Laskey]

Changes in directory nightlytest-serverside:

NightlyTestAccept.cgi updated: 1.55 -> 1.56
test.php updated: 1.25 -> 1.26
---
Log message:

reuse code for e-mail report #13

---
Diffs of the changes:  (+3 -50)

 NightlyTestAccept.cgi |   51 +-------------------------------------------------
 test.php              |    2 -
 2 files changed, 3 insertions(+), 50 deletions(-)


Index: nightlytest-serverside/NightlyTestAccept.cgi
diff -u nightlytest-serverside/NightlyTestAccept.cgi:1.55 nightlytest-serverside/NightlyTestAccept.cgi:1.56
--- nightlytest-serverside/NightlyTestAccept.cgi:1.55	Fri Sep  8 14:45:37 2006
+++ nightlytest-serverside/NightlyTestAccept.cgi	Fri Sep  8 18:54:52 2006
@@ -792,39 +792,6 @@
     $program_hash{$key}=1;
 }
 
-my ($num_removed, $num_added, $num_new_passing, $num_new_failing)=0;
-my ($removed, $added, $passing, $failing) = "";
-my $j = $dbh->prepare("SELECT program, measure, result FROM tests WHERE ".
-                      "night=$prev_night");
-$j->execute;
-while(my @row=$j->fetchrow_array){
-    my $key = $row[1]." - ".$row[0];
-    if($result_hash{$key} and $result_hash{$key} ne $row[2] and
-       $row[2] eq "PASS"){
-	$failing .= "changed: from $row[2] to $result_hash{$key} - $key\n";
-	$num_new_failing++;
-    }
-    if($result_hash{$key} and $result_hash{$key} ne $row[2] and 
-       $result_hash{$key} eq "PASS" ){
-        $passing .= "changed: from $row[2] to $result_hash{$key} - $key\n";
-        $num_new_passing++;
-    }
-
-    if(!$program_hash{$key}){
-        $removed .= "REMOVED: $key\n";
-        $num_removed++;
-    }
-    else{
-        $program_hash{$key}++;
-    }
-}
-foreach $x(keys(%program_hash)){
-    if($program_hash{$x}==1){
-        $added .= "ADDED: $x\n";
-        $num_added++;
-    }
-}
-
 ################################################################################
 #
 # Sending email to nightly test email archive
@@ -837,23 +804,9 @@
 $email .= "Nickname: $nickname\n";
 $email .= "Buildstatus: $buildstatus\n";
 
+
 if($buildstatus eq "OK") {
-  if ($passing eq "") {
-    $passing = "None";
-  } 
-  $email .= "\nNew Test Passes: $passing\n";
-  if ($failing eq "") {
-    $failing = "None";
-  } 
-  $email .= "\nNew Test Failures: $failing\n";
-  if ($added eq "") {
-    $added = "None";
-  } 
-  $email .= "\nAdded Tests: $added\n";
-  if ($removed eq "") {
-    $removed= "None";
-  } 
-  $email .= "\nRemoved Tests: $removed\n";
+  $email .= `php Emailreport.php $machine_id $night_id`;
 
   $email .= "\nSignificant changes in test results:\n";
   foreach my $meas(keys(%output_big_changes)){


Index: nightlytest-serverside/test.php
diff -u nightlytest-serverside/test.php:1.25 nightlytest-serverside/test.php:1.26
--- nightlytest-serverside/test.php:1.25	Fri Sep  8 17:56:22 2006
+++ nightlytest-serverside/test.php	Fri Sep  8 18:54:52 2006
@@ -218,7 +218,7 @@
 if($delta_exppass==0 && $delta_expfail==0 && 
    $delta_unexpfail==0 && strcmp($unexpected_failures,"")===0){
   $disp="none";
-        $sign="(-)";
+  $sign="(-)";
 }
 else{
   $disp="";