Update getopts

*Sigh* rust-lang/getopts#53 (comment)

etc/run_in_headless_android_emulator.py

@@ -176,12 +176,17 @@ def extract_arg(name, args):
 
 
 def extract_args(name, args):
+    assert "=" not in name
     previous_arg_matches = False
     for i, arg in enumerate(args):
         if previous_arg_matches:
             yield i, arg
         previous_arg_matches = arg == name
 
+        arg, sep, value = arg.partition("=")
+        if arg == name and sep == "=":
+            yield i, value
+
 
 def wait_for_tcp_server(adb, port):
     while call(adb + ["shell", "nc -z 127.0.0.1 %s" % port], stdout=sys.stderr) != 0:

etc/start_servo.py

@@ -19,6 +19,6 @@ def start_servo(port, resolution):
 
     # Use the below command if you are running this script on windows
     # cmds = 'mach.bat run --webdriver ' + port + ' --resolution ' + resolution
-    cmds = './mach run --webdriver ' + port + ' --resolution ' + resolution
+    cmds = './mach run --webdriver=' + port + ' --resolution ' + resolution
     process = subprocess.Popen(cmds, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     return process

tests/wpt/metadata/MANIFEST.json

    "support"
   ],
   "tools/wptrunner/wptrunner/browsers/servodriver.py": [
-   "6486a788b8c8fbf4fc52dd4368265571975cabb4",
+   "d788effc469bc2f582ba7ead65700e7a13c37c59",
    "support"
   ],
   "tools/wptrunner/wptrunner/browsers/webkit.py": [
    "support"
   ],
   "tools/wptrunner/wptrunner/webdriver_server.py": [
-   "9ecd009a7d8127ed793d4ef0aff19f6161bbd1ec",
+   "4ec415ce78bb89a82d5f098b1c4e8560e7ec39e4",
    "support"
   ],
   "tools/wptrunner/wptrunner/wptcommandline.py": [

tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py

@@ -106,7 +106,7 @@ def start(self, **kwargs):
             self.binary,
             self.binary_args + [
                 "--hard-fail",
-                "--webdriver", str(self.webdriver_port),
+                "--webdriver=%s" % self.webdriver_port,
                 "about:blank",
             ],
             self.debug_info

tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/webdriver_server.py

@@ -197,7 +197,7 @@ def __init__(self, logger, binary="servo", binary_args=None, host="127.0.0.1",
 
     def make_command(self):
         command = [self.binary,
-                   "--webdriver", str(self.port),
+                   "--webdriver=%s" % self.port,
                    "--hard-fail",
                    "--headless"] + self._args
         if self.binary_args: