Index: mozilla-tests/Patterns.pm |
=================================================================== |
--- mozilla-tests/Patterns.pm (revision 43940) |
+++ mozilla-tests/Patterns.pm (working copy) |
@@ -43,11 +43,15 @@ |
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) |
{ |
@@ -55,7 +59,9 @@ |
} |
} |
- dbg("getuniversekey=$key"); |
+ if ($DEBUG) { |
+ dbg("getuniversekey=$key"); |
+ } |
return $key; |
} |
@@ -69,31 +75,45 @@ |
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; |
} |
@@ -107,11 +127,15 @@ |
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; |
@@ -124,7 +148,9 @@ |
my $prevline = ''; |
my $i; |
- dbg("dumping records"); |
+ if ($DEBUG) { |
+ dbg("dumping records"); |
+ } |
# @records = sort sortrecords @records; |
@@ -178,9 +204,9 @@ |
$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 = (); |
@@ -200,8 +226,8 @@ |
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'; |
@@ -216,8 +242,8 @@ |
$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)); |