Bug 287262 - Allow the list of directories for l10n comparison to be configurable a=Chase

tools/tinderbox/build-seamonkey-util.pl

@@ -24,7 +24,7 @@ use Config;         # for $Config{sig_name} and $Config{sig_num}
 use File::Find ();
 use File::Copy;
 
-$::UtilsVersion = '$Revision: 1.296 $ ';
+$::UtilsVersion = '$Revision: 1.297 $ ';
 
 package TinderUtils;
 
@@ -217,6 +217,7 @@ sub PrintExampleConfig {
     open DEFAULTS, $tinder_defaults or print "can't open $tinder_defaults, $!\n";
     while (<DEFAULTS>) {
         s/^\$/\#\$/;
+        s/^\@/\#\@/;
         print;
     }
     close DEFAULTS;
@@ -336,13 +337,13 @@ sub LoadConfig {
         open CONFIG, 'tinder-config.pl' or
             print "can't open tinder-config.pl, $?\n";
 
-        while (<CONFIG>) {
-            package Settings;
-            #warn "config:$_";
-            eval;
-        }
-
+        local $/ = undef;
+        my $config = <CONFIG>;
         close CONFIG;
+
+        package Settings;
+        eval $config;
+
     } else {
         warn "Error: Need tinderbox config file, tinder-config.pl\n";
         warn "       To get started, run the following,\n";
@@ -888,7 +889,7 @@ sub BuildIt {
         unless ($Settings::SkipMozilla) {
           
           # Make sure we have an up-to-date $Settings::moz_client_mk
-            
+          
           # Set CVSROOT here.  We should only need to checkout a new
           # version of $Settings::moz_client_mk once; we might have 
           # more than one cvs tree so set CVSROOT here to avoid confusion.

tools/tinderbox/post-mozilla-rel.pl

@@ -400,9 +400,10 @@ sub packit_l10n {
   }
 
   my @locales = <ALL_LOCALES>;
-  chomp @locales;
   close ALL_LOCALES;
 
+  map { /([a-z-]+)/i; $_ = $1 } @locales;
+
   TinderUtils::print_log "Building following locales: @locales\n";
 
   my $start_time = TinderUtils::adjust_start_time(time());
@@ -525,14 +526,19 @@ sub packit_l10n {
       }
     }
 
-    $status = run_locale_shell_command "$^X $srcdir/toolkit/locales/compare-locales.pl $srcdir/toolkit/locales/en-US $srcdir/toolkit/locales/$locale";
-    if ($tinderstatus eq 'success' && $status != 0) {
-      $tinderstatus = 'testfailed';
-    }
-
-    $status = run_locale_shell_command "$^X $srcdir/toolkit/locales/compare-locales.pl $srcdir/browser/locales/en-US $srcdir/browser/locales/$locale";
-    if ($tinderstatus eq 'success' && $status != 0) {
-      $tinderstatus = 'testfailed';
+    for my $localetest (@Settings::CompareLocaleDirs) {
+      my $originaldir = "$srcdir/$localetest/locales/en-US";
+      my $localedir;
+      if ($Settings::CompareLocalesAviary) {
+        $localedir = "$srcdir/$localetest/locales/$locale";
+      }
+      else {
+        $localedir = "$srcdir/../l10n/$locale/$localetest";
+      }
+      $status = run_locale_shell_command "$^X $srcdir/toolkit/locales/compare-locales.pl $originaldir $localedir";
+      if ($tinderstatus eq 'success' && $status != 0) {
+        $tinderstatus = 'testfailed';
+      }
     }
     close LOCLOG;
 

tools/tinderbox/tinder-defaults.pl

@@ -59,6 +59,10 @@ $DHTMLPerformanceTest     = 0;  # Tdhtml
 $QATest                   = 0;  
 $XULWindowOpenTest        = 0;  # Txul
 $StartupPerformanceTest   = 0;  # Ts
+@CompareLocaleDirs        = (); # Run compare-locales test on these directories
+# ("network","dom","toolkit","security/manager");
+$CompareLocalesAviary     = 0;  # Should the compare-locales commands use the
+                                # aviary directory structure?
 
 $TestsPhoneHome           = 0;  # Should test report back to server?