Changeset 28621 for other-projects/nightly-tasks/diffcol/trunk/task.pl

Timestamp:

2013-11-13T20:14:02+13:00 (10 years ago)

Author:

ak19

Message:

1. To get the caveat-page to display the fail icon next to the diffcol report link, add in a FAIL keyword to the report being uploaded. 2. Leopard report is explicitly labelled Leopard now.

File:

• other-projects/nightly-tasks/diffcol/trunk/task.pl (modified) (3 diffs)

other-projects/nightly-tasks/diffcol/trunk/task.pl

@@ -40 +40 @@
     $osversion=`uname -r`; # e.g. 12.x.x
     #$osversion =~ s@\..*$@@; # e.g.12
-    $osversion = ($osversion =~ m@^1[1-9](\.)?@i) ? "Lion-" : "";
+    $osversion = ($osversion =~ m@^1[1-9](\.)?@i) ? "Lion-" : "Leopard-"; #"";
 }
 
@@ -403 +403 @@
     # $Config{'archname64'} doesn't work on the Ubuntu and the Sys::Info package seems to not be supported
     # well on ActivePerl. 
-    # But since we know we're on a Linux/Darwin machine at this point, wecan just run `uname -m` and other linux cmds
+    # But since we know we're on a Linux/Darwin machine at this point, we can just run `uname -m` and other linux cmds
 
     # osversion will be "Lion" or ""
@@ -889 +889 @@
     } else {
         $os_entry = "diffcol-".$^O."-$os_entry";
+    }
+    
+    # if the test failed, prefix "failed" to the report so that it shows up with an error icon on the caveat page
+    my $cmd = "java org.apache.xalan.xslt.Process -IN $xmlout -XSL $ENV{'TASK_HOME'}/xsl/passed-or-not.xsl";
+    my $result = `$cmd`;
+    if($result ne "yes") {
+        $os_entry =~ s/diffcol-/diffcol-FAIL-/;
     }