Simon Sapin 2018-08-24 16:29:43 +02:00
parent 76dd6a4cdb
commit a9627d233f
6 changed files with 13 additions and 8 deletions

6
Cargo.lock generated
View file

@ -1087,7 +1087,7 @@ dependencies = [
[[package]]
name = "getopts"
version = "0.2.14"
version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -3292,7 +3292,7 @@ dependencies = [
"embedder_traits 0.0.1",
"env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
"getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
"getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -4323,7 +4323,7 @@ dependencies = [
"checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
"checksum gaol 0.0.1 (git+https://github.com/servo/gaol)" = "<none>"
"checksum gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518"
"checksum getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9047cfbd08a437050b363d35ef160452c5fe8ea5187ae0a624708c91581d685"
"checksum getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "b900c08c1939860ce8b54dc6a89e26e00c04c380fd0e09796799bd7f12861e05"
"checksum gif 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff3414b424657317e708489d2857d9575f4403698428b040b609b9d1c1a84a2c"
"checksum gl_generator 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a795170cbd85b5a7baa58d6d7525cae6a03e486859860c220f7ebbbdd379d0a"
"checksum gleam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d41e7ac812597988fdae31c9baec3c6d35cadb8ad9ab88a9bf9c0f119ed66c2"

View file

@ -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:

View file

@ -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

View file

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

View file

@ -106,7 +106,7 @@ class ServoWebDriverBrowser(Browser):
self.binary,
self.binary_args + [
"--hard-fail",
"--webdriver", str(self.webdriver_port),
"--webdriver=%s" % self.webdriver_port,
"about:blank",
],
self.debug_info

View file

@ -197,7 +197,7 @@ class ServoDriverServer(WebDriverServer):
def make_command(self):
command = [self.binary,
"--webdriver", str(self.port),
"--webdriver=%s" % self.port,
"--hard-fail",
"--headless"] + self._args
if self.binary_args: