Show
Ignore:
Timestamp:
13.11.2013 20:14:02 (6 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • other-projects/nightly-tasks/diffcol/trunk/task.pl

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