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

mozilla-tests/Patterns.pm

 # -*- 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/
 #
 # Software distributed under the License is distributed on an "AS IS" basis,
@@ skipping 25 matching lines @@
 # ***** END LICENSE BLOCK *****
 
 package Patterns;
 
 sub getuniversekey
 {
     my ($machinerecord, $excludeduniversefield) = @_;
     my $i;
     my $key = '';
 
-    dbg("getuniversekey: \$machinerecord=" . recordtostring($machinerecord) . ", \$excludeduniversefield=$excludeduniversefield");
+    if ($DEBUG) {
+        dbg("getuniversekey: \$machinerecord=" . recordtostring($machinerecord) . ", \$excludeduniversefield=$excludeduniversefield");
+    }
 
     for ($i = 0; $i < @universefields; $i++)
     {
-        dbg("getuniversekey: \$universefields[$i]=$universefields[$i]");
+        if ($DEBUG) {
+            dbg("getuniversekey: \$universefields[$i]=$universefields[$i]");
+        }
 
         if ($universefields[$i] ne $excludeduniversefield)
         {
             $key .= $machinerecord->{$universefields[$i]}
         }
     }
 
-    dbg("getuniversekey=$key");
+    if ($DEBUG) {
+        dbg("getuniversekey=$key");
+    }
 
     return $key;
 }
 
 sub getuniverse
 {
     my ($universekey, $excludeduniversefield) = @_;
     my $i;
     my $value;
     my $testrun;
     my @universe = ();
     my %universehash = ();
 
-    dbg("getuniverse: \$universekey=$universekey, \$excludeduniversefield=$excludeduniversefield");
+    if ($DEBUG) {
+        dbg("getuniverse: \$universekey=$universekey, \$excludeduniversefield=$excludeduniversefield");
+    }
 
     for ($i = 0; $i < @testruns; $i++)
     {
         $testrun = $testruns[$i];
-        dbg("getuniverse: \$testruns[$i]=" . recordtostring($testrun));
+        if ($DEBUG) {
+            dbg("getuniverse: \$testruns[$i]=" . recordtostring($testrun));
+        }
         $testrununiversekey = getuniversekey($testrun, $excludeduniversefield);
-        dbg("getuniverse: \$testrununiversekey=$testrununiversekey");
+        if ($DEBUG) {
+            dbg("getuniverse: \$testrununiversekey=$testrununiversekey");
+        }
         if ($testrununiversekey =~ /$universekey/)
         {
-            dbg("getuniverse: matched \$testrununiversekey=$testrununiversekey to \$universekey=$universekey");
+            if ($DEBUG) {
+                dbg("getuniverse: matched \$testrununiversekey=$testrununiversekey to \$universekey=$universekey");
+            }
             $value = $testrun->{$excludeduniversefield};
             
-            dbg("getuniverse: \$testrun->{$excludeduniversefield}=$value");
+            if ($DEBUG) {
+                dbg("getuniverse: \$testrun->{$excludeduniversefield}=$value");
+            }
 
             if (! $universehash{$value} )
             {
-                dbg("getuniverse: pushing $value");
+                if ($DEBUG) {
+                    dbg("getuniverse: pushing $value");
+                }
                 push @universe, ($value);
                 $universehash{$value} = 1;
             }
         }
     }
     @universe = sort @universe;
-    dbg("getuniverse=" . join(',', @universe));
+    if ($DEBUG) {
+        dbg("getuniverse=" . join(',', @universe));
+    }
     return @universe;
 }
 
 sub recordtostring
 {
     my ($record) = @_;
     my $j;
     my $line   = '';
     my $field;
 
     for ($j = 0; $j < @recordfields - 1; $j++)
     {
         $field = $recordfields[$j];
-        dbg("recordtostring: \$field=$field, \$record->{$field}=$record->{$field}");
+        if ($DEBUG) {
+            dbg("recordtostring: \$field=$field, \$record->{$field}=$record->{$field}");
+        }
         $line .= "$field=$record->{$field}, ";
     }
     $field = $recordfields[$#recordfields];
-    dbg("recordtodtring: \$field=$field, \$record->{$field}= $record->{$field}");
+    if ($DEBUG) {
+        dbg("recordtodtring: \$field=$field, \$record->{$field}= $record->{$field}");
+    }
     $line .= "$field=$record->{$field}";
 
     return $line;
 }
 
 sub dumprecords
 {
     my $record;
     my $line;
     my $prevline = '';
     my $i;
 
-    dbg("dumping records");
+    if ($DEBUG) {
+        dbg("dumping records");
+    }
 
 #    @records = sort sortrecords @records;
 
     for ($i = 0; $i < @records; $i++)
     {
         $record = $records[$i];
         $line   = recordtostring($record);
         if ($line eq $prevline)
         {
             dbg("DUPLICATE $line") if ($DEBUG);
@@ skipping 33 matching lines @@
 }
 
 BEGIN 
 {
     dbg("begin");
 
     my $test_dir = $ENV{TEST_DIR} || "/work/mozilla/mozilla.com/test.mozilla.com/www";
 
     $DEBUG = $ENV{DEBUG};
 
-    @recordfields   = ('TEST_ID', 'TEST_BRANCH', 'TEST_REPO', 'TEST_BUILDTYPE', 'TEST_TYPE', 'TEST_OS', 'TEST_KERNEL', 'TEST_PROCESSORTYPE', 'TEST_MEMORY', 'TEST_CPUSPEED', 'TEST_TIMEZONE', 'TEST_RESULT', 'TEST_EXITSTATUS', 'TEST_DESCRIPTION');
-    @sortkeyfields  = ('TEST_ID', 'TEST_RESULT', 'TEST_EXITSTATUS', 'TEST_DESCRIPTION', 'TEST_BRANCH', 'TEST_REPO', 'TEST_BUILDTYPE', 'TEST_TYPE', 'TEST_OS', 'TEST_KERNEL', 'TEST_PROCESSORTYPE', 'TEST_MEMORY', 'TEST_CPUSPEED', 'TEST_TIMEZONE', );
-    @universefields = ('TEST_BRANCH', 'TEST_REPO', 'TEST_BUILDTYPE', 'TEST_TYPE', 'TEST_OS', 'TEST_KERNEL', 'TEST_PROCESSORTYPE', 'TEST_MEMORY', 'TEST_CPUSPEED', 'TEST_TIMEZONE');
+    @recordfields   = ('TEST_ID', 'TEST_BRANCH', 'TEST_REPO', 'TEST_BUILDTYPE', 'TEST_TYPE', 'TEST_OS', 'TEST_KERNEL', 'TEST_PROCESSORTYPE', 'TEST_MEMORY', 'TEST_TIMEZONE', 'TEST_OPTIONS', 'TEST_RESULT', 'TEST_EXITSTATUS', 'TEST_DESCRIPTION');
+    @sortkeyfields  = ('TEST_ID', 'TEST_RESULT', 'TEST_EXITSTATUS', 'TEST_DESCRIPTION', 'TEST_BRANCH', 'TEST_REPO', 'TEST_BUILDTYPE', 'TEST_TYPE', 'TEST_OS', 'TEST_KERNEL', 'TEST_PROCESSORTYPE', 'TEST_MEMORY', 'TEST_TIMEZONE', 'TEST_OPTIONS');
+    @universefields = ('TEST_BRANCH', 'TEST_REPO', 'TEST_BUILDTYPE', 'TEST_TYPE', 'TEST_OS', 'TEST_KERNEL', 'TEST_PROCESSORTYPE', 'TEST_MEMORY', 'TEST_TIMEZONE', 'TEST_OPTIONS');
 
     @records = ();
 
     @testruns = ();
 
     my $UNIVERSE = $ENV{TEST_UNIVERSE} || "$test_dir/tests/mozilla.org/js/universe.data";
 
     dbg "UNIVERSE=$UNIVERSE";
 
     open TESTRUNS, "<$UNIVERSE" or die "$?";
 
     while (<TESTRUNS>) {
 
         chomp;
 
         dbg("BEGIN: \$_=$_\n");
 
         my $record = {};
 
-        my ($test_os, $test_kernel, $test_processortype, $test_memory, $test_cpuspeed, $test_timezone, $test_branch, $test_repo, $test_buildtype, $test_type) = $_ =~ 
-            /^TEST_OS=([^,]*), TEST_KERNEL=([^,]*), TEST_PROCESSORTYPE=([^,]*), TEST_MEMORY=([^,]*), TEST_CPUSPEED=([^,]*), TEST_TIMEZONE=([^,]*), TEST_BRANCH=([^,]*), TEST_REPO=([^,]*), TEST_BUILDTYPE=([^,]*), TEST_TYPE=([^,]*)/;
+        my ($test_os, $test_kernel, $test_processortype, $test_memory, $test_timezone, $test_jsoptions, $test_branch, $test_repo, $test_buildtype, $test_type) = $_ =~ 
+            /^TEST_OS=([^,]*), TEST_KERNEL=([^,]*), TEST_PROCESSORTYPE=([^,]*), TEST_MEMORY=([^,]*), TEST_TIMEZONE=([^,]*), TEST_OPTIONS=([^,]*), TEST_BRANCH=([^,]*), TEST_REPO=([^,]*), TEST_BUILDTYPE=([^,]*), TEST_TYPE=([^,]*)/;
 
         $record->{TEST_ID}            = 'dummy';
         $record->{TEST_RESULT}        = 'dummy';
         $record->{TEST_EXITSTATUS}    = 'dummy';
         $record->{TEST_DESCRIPTION}   = 'dummy';
 
         $record->{TEST_BRANCH}        = $test_branch;
         $record->{TEST_REPO}          = $test_repo;
         $record->{TEST_BUILDTYPE}     = $test_buildtype;
         $record->{TEST_TYPE}          = $test_type;
         $record->{TEST_OS}            = $test_os;
         $record->{TEST_KERNEL}        = $test_kernel;
         $record->{TEST_PROCESSORTYPE} = $test_processortype;
         $record->{TEST_MEMORY}        = $test_memory;
-        $record->{TEST_CPUSPEED}      = $test_cpuspeed;
         $record->{TEST_TIMEZONE}      = $test_timezone;
+        $record->{TEST_OPTIONS}       = $test_jsoptions;
 
         dbg("BEGIN: testrun: " . recordtostring($record));
 
         push @testruns, ($record);
     }
 
     close TESTRUNS;
 
 }
 
 1;