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

mozilla-tests/post-process-logs.pl

Index: mozilla-tests/post-process-logs.pl
===================================================================
--- mozilla-tests/post-process-logs.pl	(revision 43940)
+++ mozilla-tests/post-process-logs.pl	(working copy)
@@ -69,6 +69,7 @@
        $test_type, 
        $tmp_test_type,
        $test_description, 
+       $test_jsoptions,
        @messages,
        $test_processortype, 
        $test_kernel, 
@@ -80,10 +81,11 @@
        $state);
 
 local $test_memory = 0;
-local $test_cpuspeed = 0;
 local %test_reported = ();
 local $test_repo = 'CVS';
 
+$test_jsoptions = 'none';
+
 while ($file = shift @ARGV)
 {
     @messages = ();
@@ -140,9 +142,9 @@
             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;
         }
@@ -162,26 +164,28 @@
         {
             $test_os = $envval;
         }
-    }
 
-    if ($test_cpuspeed < 4)
-    {
-        $test_cpuspeed = 'slow';
+        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";
+        }
     }
-    elsif ($test_cpuspeed < 9)
-    {
-        $test_cpuspeed = 'medium';
-    }
-    else
-    {
-        $test_cpuspeed = 'fast';
-    }
 
     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";
@@ -476,9 +480,11 @@
                !/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/)
@@ -548,7 +554,7 @@
 sub outresults
 {
     dbg "sorting temp file $temp";
-    system("sort < $temp | uniq");
+    system("sort -u < $temp");
     dbg "finished sorting";
 }
 
@@ -576,8 +582,8 @@
         "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, " .