Update the mozilla tests to new version (as of 2010-06-29).

mozilla-tests/post-process-logs.pl

 #!/usr/bin/perl -w
 # -*- Mode: Perl; tab-width: 4; indent-tabs-mode: nil; -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/
 #
@@ skipping 51 matching lines @@
 
 local ($test_id,
        $tmp_test_id,
        $tmp_test_exit_status,
        %test_id,
        %test_reported,
        $test_result, 
        $test_type, 
        $tmp_test_type,
        $test_description, 
+       $test_jsoptions,
        @messages,
        $test_processortype, 
        $test_kernel, 
        $test_suite,
        $test_exit_status,
        @expected_exit_code_list,
        $expected_exit_code,
        $exit_code,
        $state);
 
 local $test_memory = 0;
-local $test_cpuspeed = 0;
 local %test_reported = ();
 local $test_repo = 'CVS';
 
+$test_jsoptions = 'none';
+
 while ($file = shift @ARGV)
 {
     @messages = ();
 
     dbg "file: $file";
 
     my $filename = basename $file;
 
     dbg "filename: $file";
 
@@ skipping 36 matching lines @@
         $_ =~ s/[\r]$//;
         $_ =~ s/[\r]/CR/g;
         $_ =~ s/[\x01-\x08]//g;
         $_ =~ s/\s+$//;
 
         if ($debug)
         {
             dbg "\nINPUT: $_";
         }
 
-        last if ( $_ =~ /^arguments:/);
+        last if ( $_ =~ /^include:/);
 
-        if (($envval) = $_ =~ /^environment: TEST_MOZILLA_HG=http:\/\/hg.mozilla.org\/(.*)/ )
+        if (($envval) = $_ =~ /^environment: TEST_MOZILLA_HG=http:\/\/hg.mozilla.org.*\/([^\/]+)/ )
         {
             $test_repo = $envval;
         }
         elsif (($envvar, $envval) = $_ =~ /^environment: (TEST_[A-Z0-9_]*)=(.*)/ )
         {
             dbg "envvar=$envvar, envval=$envval";
             if ($envvar =~ /TEST_KERNEL/)
             {
                 $envval =~ s/([0-9]+)\.([0-9]+)\.([0-9]+).*/$1.$2.$3/;
                 dbg "found TEST_KERNEL";
             }
             $envvar =~ tr/A-Z/a-z/;
             $$envvar = $envval;
             dbg $envvar . "=" . $$envvar;
         }
         elsif (($envval) = $_ =~ /^environment: OSID=(.*)/ )
         {
             $test_os = $envval;
         }
-    }
 
-    if ($test_cpuspeed < 4)
-    {
-        $test_cpuspeed = 'slow';
-    }
-    elsif ($test_cpuspeed < 9)
-    {
-        $test_cpuspeed = 'medium';
-    }
-    else
-    {
-        $test_cpuspeed = 'fast';
+        if ($_ =~ /^arguments: javascriptoptions/)
+        {
+            my ($o, @s, $j);
+
+            ($o) = $_ =~ /^arguments: javascriptoptions=(.*)/;
+            $o =~ s/(-\w) (\w)/$1$2/g; 
+            @s = sort split / /, $o; 
+            $j = join(" ", @s); 
+            $j =~ s/(-\w)(\w)/$1 $2/g; 
+
+            $test_jsoptions = $j || "none";
+            dbg "javascriptoptions: $test_jsoptions";
+        }
     }
 
     if ($test_product eq "js")
     {
         $test_type       = "shell";
     }
-    elsif ($test_product eq "firefox" || $test_product eq "thunderbird")
+    elsif ($test_product eq "firefox" || $test_product eq "thunderbird" ||
+        $test_product eq "fennec")
     {
         $test_buildtype  = "nightly" unless $test_buildtype;
         $test_type       = "browser";
     }
 
 #  Expected sequence if all output written to the log.
 #
 #    Input                     
 # -----------------------------
 # JavaScriptTest: Begin Run    
@@ skipping 274 matching lines @@
         elsif ($_ && 
                !/^\s+$/ && 
                !/^(STATUS:| *PASSED!| *FAILED!)/ && 
                !/^JavaScriptTest:/ && 
                !/^[*][*][*]/ && 
                !/^[-+]{2,2}(WEBSHELL|DOMWINDOW)/ && 
                !/^Spider:/ && 
                !/real.*user.*sys.*$/ && 
                !/user.*system.*elapsed/)
         {
-            if ('runningtest, reportingtest' =~ /$state/)
+            if ('runningtest, reportingtest' =~ /$state/ && $#messages < 1000)
             {
-
+                # limit the number of processed and collected messages since firefox can
+                # go berserk and dump a couple of million output lines for a single test
+                # if things go horribly wrong.
                 if (/error: can.t allocate region/ || /set a breakpoint in malloc_error_break/ || 
                     /set a breakpoint in szone_error to debug/ || /malloc:.*mmap/ || /vm_allocate/ ||
                     /terminate called after throwing an instance of .*bad_alloc/)
                 {
                     dbg "Adding message: $_ converted to /$test_id{$state}:0: out of memory";
                     push @messages, ('/' . $test_id{$state} . ':0: out of memory');
                 }
                 elsif (/\.js, line [0-9]+: out of memory/ )
                 {
                     s/\.js, line ([0-9]+): out of memory/\.js:$1:/;
@@ skipping 49 matching lines @@
     if ($debug)
     {
         my $msg = shift;
         print STDERR "DEBUG: $msg\n";
     }
 }
 
 sub outresults
 {
     dbg "sorting temp file $temp";
-    system("sort < $temp | uniq");
+    system("sort -u < $temp");
     dbg "finished sorting";
 }
 
 sub outputrecord
 {
     my ($test_id, $test_description, $test_result) = @_;
 
     # cut off the extra jstest: summaries as they duplicate the other
     # output and follow it.
     $test_description =~ s/jstest:.*//;
 
 #    if (length($test_description) > 6000)
 #    {
 #        $test_description = substr($test_description, 0, 6000);
 #    }
 #
 
     my $output = 
         "TEST_ID=$test_id, " .
         "TEST_BRANCH=$test_branchid, " .
         "TEST_REPO=$test_repo, " .
         "TEST_BUILDTYPE=$test_buildtype, " .
         "TEST_TYPE=$test_type, " .
         "TEST_OS=$test_os, " .
         "TEST_KERNEL=$test_kernel, " .
         "TEST_PROCESSORTYPE=$test_processortype, " .
         "TEST_MEMORY=$test_memory, " .
-        "TEST_CPUSPEED=$test_cpuspeed, " . 
         "TEST_TIMEZONE=$test_timezone, " . 
+        "TEST_OPTIONS=$test_jsoptions, " .
         "TEST_RESULT=$test_result, " .
         "TEST_EXITSTATUS=$test_exit_status, " .
         "TEST_DESCRIPTION=$test_description, " .
         "TEST_MACHINE=$test_machine, " .
         "TEST_DATE=$test_date" .
         "\n";
 
     if ($debug)
     {
         dbg "RECORD: $output";
     }
     print TEMP $output;
 
     $test_reported{$test_id} = 1;
     @messages = ();
 }