Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Do not mutate kwargs["binary_args"] (#37308)

Browse source 
Fixup of #37255, we should not modify existing `kwargs["binary_args"]`
or else subsuite's `binary_args` will apply in non subsuite runs.

Testing: I verified fix in my personal fork run with vello (where I
actually use subsuite).

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
sagudev 2025-06-07 06:46:39 +02:00 • committed by GitHub
parent 34a64a944a
commit adb5df3354
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/wpt/meta/MANIFEST.json vendored
View file

@ -516386,11 +516386,11 @@
] ]
}, },
"servo.py": [ "servo.py": [
"49a2613ff12ba4f3b085549a31266a21861bbaf1", "07441780ccc7682c6b7616271aeb9a40310a433a",
[] []
], ],
"servodriver.py": [ "servodriver.py": [
"a8aa5ae001b1ecd53a7f2f4515efa299c9ce8809", "f72f2257a3817e33817dc7a190da8e61cf6442da",
[] []
], ],
"webkit.py": [ "webkit.py": [

3
tests/wpt/tests/tools/wptrunner/wptrunner/browsers/servo.py vendored
View file

@ -38,11 +38,10 @@ def check_args(**kwargs):
def browser_kwargs(logger, test_type, run_info_data, config, subsuite, **kwargs): def browser_kwargs(logger, test_type, run_info_data, config, subsuite, **kwargs):
kwargs["binary_args"].extend(subsuite.config.get("binary_args", []))
return { return {
"binary": kwargs["binary"], "binary": kwargs["binary"],
"debug_info": kwargs["debug_info"], "debug_info": kwargs["debug_info"],
"binary_args": kwargs["binary_args"], "binary_args": kwargs["binary_args"] + subsuite.config.get("binary_args", []),
"user_stylesheets": kwargs.get("user_stylesheets"), "user_stylesheets": kwargs.get("user_stylesheets"),
"ca_certificate_path": config.ssl_config["ca_cert_path"], "ca_certificate_path": config.ssl_config["ca_cert_path"],
} }

3
tests/wpt/tests/tools/wptrunner/wptrunner/browsers/servodriver.py vendored
View file

@ -40,10 +40,9 @@ def check_args(**kwargs):
def browser_kwargs(logger, test_type, run_info_data, config, subsuite, **kwargs): def browser_kwargs(logger, test_type, run_info_data, config, subsuite, **kwargs):
kwargs["binary_args"].extend(subsuite.config.get("binary_args", []))
return { return {
"binary": kwargs["binary"], "binary": kwargs["binary"],
"binary_args": kwargs["binary_args"], "binary_args": kwargs["binary_args"] + subsuite.config.get("binary_args", []),
"debug_info": kwargs["debug_info"], "debug_info": kwargs["debug_info"],
"server_config": config, "server_config": config,
"user_stylesheets": kwargs.get("user_stylesheets"), "user_stylesheets": kwargs.get("user_stylesheets"),