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

mozilla-tests/jsDriver.pl

 #!/usr/bin/perl
 # -*- Mode: Perl; tab-width: 4; indent-tabs-mode: nil; -*-
 # vim: set ts=4 sw=4 et tw=80:
 # ***** 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 25 matching lines @@
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 # Second cut at runtests.pl script originally by
 # Christine Begle (cbegle@netscape.com)
 # Branched 11/01/99
 
 use strict;
-use Getopt::Mixed "nextOption";
 use File::Temp qw/ tempfile tempdir /;
 use POSIX qw(sys_wait_h);
 
 my $os_type = &get_os_type;
 my $unixish = (($os_type ne "WIN") && ($os_type ne "MAC"));
 my $path_sep = ($os_type eq "MAC") ? ":" : "/";
 my $win_sep  = ($os_type eq "WIN")? &get_win_sep : "";
 my $redirect_command = ($os_type ne "MAC") ? " 2>&1" : "";
 
 # command line option defaults
@@ skipping 20 matching lines @@
 my $opt_enable_narcissus = 0;
 my $opt_narcissus_path = "";
 my $opt_no_quit = 0;
 my $opt_report_summarized_results = 0;
 
 # command line option definition
 my $options = "b=s bugurl>b c=s classpath>c e=s engine>e f=s file>f " .
   "h help>h i j=s javapath>j k confail>k K linefail>K R report>R l=s list>l " .
   "L=s neglist>L o=s opt>o p=s testpath>p s=s shellpath>s t trace>t " .
   "T=s timeout>T u=s lxrurl>u " .
-  "x noexitmunge>x n:s narcissus>n " .
+  "x noexitmunge>x n=s narcissus>n " .
   "Q noquitinthandler>Q";
 
+my $last_option;
+
 if ($os_type eq "MAC") {
     $opt_suite_path = `directory`;
     $opt_suite_path =~ s/[\n\r]//g;
     $opt_suite_path .= ":";
 } else {
     $opt_suite_path = "./";
 }
 
 &parse_args;
 
@@ skipping 395 matching lines @@
     close (OUTPUT);
 
     &status ("Wrote results to '$opt_output_file'.");
 
     if ($opt_console_failures) {
         &status ("$failures_reported test(s) failed");
     }
 
 }
 
+sub next_option {
+    my ($key, $val, $implied);
+
+    return if @ARGV == 0;
+
+    &dd ("ARGV is now: @ARGV\n");
+
+    $key = shift @ARGV;
+    if ($key =~ s/^--?(.*)/$1/) {
+        $implied = 0;
+    } else {
+        $implied = 1;
+        $val = $key;
+        $key = $last_option;
+    }
+
+    if ($key =~ /\w+/ and $options =~ /\b$key>(\w+)/) {
+        $key = $1;
+    }
+
+    if ($options =~ /\b$key=s\b/) {
+        if (!$implied) {
+            die "option '$key' requires an argument" if @ARGV == 0;
+            $val = shift @ARGV;
+        }
+    } elsif ($options =~ /(^|\s)$key(\s|$)/) {
+        die "option '$key' doesn't take an argument" if $implied;
+        $val = 1;
+    } else {
+        die "can't figure out option '$key'";
+    }
+    $last_option = $key;
+    return ($key, $val);
+}
+
 sub parse_args {
     my ($option, $value, $lastopt);
 
     &dd ("checking command line options.");
 
-    Getopt::Mixed::init ($options);
-    $Getopt::Mixed::order = $Getopt::Mixed::RETURN_IN_ORDER;
-
-    while (($option, $value) = nextOption()) {
+    while (($option, $value) = next_option()) {
 
         if ($option eq "b") {
             &dd ("opt: setting bugurl to '$value'.");
             $opt_bug_url = $value;
 
         } elsif ($option eq "c") {
             &dd ("opt: setting classpath to '$value'.");
             $opt_classpath = $value;
 
         } elsif (($option eq "e") || (($option eq "") && ($lastopt eq "e"))) {
@@ skipping 94 matching lines @@
 
         } else {
             &dd ("opt: unknown option $option '$value'.");
             &usage;
         }
 
         $lastopt = $option;
 
     }
 
-    Getopt::Mixed::cleanup();
-
     if ($#opt_engine_list == -1) {
         die "You must select a shell to test in.\n";
     }
 
 }
 
 #
 # print the arguments that this script expects
 #
 sub usage {
@@ skipping 917 matching lines @@
                   "bug: $bug_number " .
                   "result: $result " .
                   "type: shell " . 
                   "description: $description " .
                   "expected: $expected " .
                   "actual: $actual " .
                   "reason: $reason" .
                   "\n");
 
 }