Update manifest integration to reflect upstream API changes.

This commit is contained in:
Tom Servo 2018-11-23 11:03:43 -05:00
parent 642f3cb541
commit 846c3ba1a3
5 changed files with 22 additions and 47 deletions

1
.gitignore vendored
View file

@ -2,6 +2,7 @@
/.cargo/* /.cargo/*
!/.cargo/config.* !/.cargo/config.*
/.servobuild /.servobuild
/.wpt
/android-toolchains /android-toolchains
/target /target
/ports/android/bin /ports/android/bin

View file

@ -14,6 +14,11 @@ from wptrunner.wptcommandline import get_test_paths, set_from_config
manifest = None manifest = None
servo_root = os.path.join(os.path.dirname(__file__),
os.pardir,
os.pardir)
def do_delayed_imports(wpt_dir): def do_delayed_imports(wpt_dir):
global manifest global manifest
sys.path.insert(0, os.path.join(wpt_dir, "tools", "manifest")) sys.path.insert(0, os.path.join(wpt_dir, "tools", "manifest"))
@ -54,16 +59,14 @@ def update(logger, wpt_dir, check_clean=True, rebuild=False):
def _update(logger, test_paths, rebuild): def _update(logger, test_paths, rebuild):
for url_base, paths in test_paths.iteritems(): for url_base, paths in test_paths.iteritems():
manifest_path = os.path.join(paths["metadata_path"], "MANIFEST.json") manifest_path = os.path.join(paths["metadata_path"], "MANIFEST.json")
m = None cache_subdir = os.path.relpath(os.path.dirname(manifest_path),
if not rebuild: os.path.dirname(__file__))
try: manifest.manifest.load_and_update(paths["tests_path"],
m = manifest.manifest.load(paths["tests_path"], manifest_path) manifest_path,
except manifest.manifest.ManifestVersionMismatch: url_base,
logger.info("Manifest format changed, rebuilding") working_copy=True,
if m is None: cache_root=os.path.join(servo_root, ".wpt",
m = manifest.manifest.Manifest(url_base) cache_subdir))
manifest.update.update(paths["tests_path"], m, working_copy=True)
manifest.manifest.write(m, manifest_path)
return 0 return 0

View file

@ -309438,11 +309438,6 @@
{} {}
] ]
], ],
"tools/.coveragerc": [
[
{}
]
],
"tools/.gitattributes": [ "tools/.gitattributes": [
[ [
{} {}
@ -310683,11 +310678,6 @@
{} {}
] ]
], ],
"tools/third_party/attrs/.coveragerc": [
[
{}
]
],
"tools/third_party/attrs/.github/CODE_OF_CONDUCT.rst": [ "tools/third_party/attrs/.github/CODE_OF_CONDUCT.rst": [
[ [
{} {}
@ -311238,11 +311228,6 @@
{} {}
] ]
], ],
"tools/third_party/funcsigs/.coveragerc": [
[
{}
]
],
"tools/third_party/funcsigs/.travis.yml": [ "tools/third_party/funcsigs/.travis.yml": [
[ [
{} {}
@ -311348,11 +311333,6 @@
{} {}
] ]
], ],
"tools/third_party/h2/.coveragerc": [
[
{}
]
],
"tools/third_party/h2/.gitignore": [ "tools/third_party/h2/.gitignore": [
[ [
{} {}
@ -311993,11 +311973,6 @@
{} {}
] ]
], ],
"tools/third_party/html5lib/.coveragerc": [
[
{}
]
],
"tools/third_party/html5lib/.gitignore": [ "tools/third_party/html5lib/.gitignore": [
[ [
{} {}
@ -313778,11 +313753,6 @@
{} {}
] ]
], ],
"tools/third_party/pytest/.coveragerc": [
[
{}
]
],
"tools/third_party/pytest/.gitattributes": [ "tools/third_party/pytest/.gitattributes": [
[ [
{} {}
@ -316393,11 +316363,6 @@
{} {}
] ]
], ],
"tools/wptserve/.coveragerc": [
[
{}
]
],
"tools/wptserve/.gitignore": [ "tools/wptserve/.gitignore": [
[ [
{} {}
@ -667555,7 +667520,7 @@
"support" "support"
], ],
"tools/wptrunner/wptrunner/wptcommandline.py": [ "tools/wptrunner/wptrunner/wptcommandline.py": [
"8c0b8d74a160046d7d6976235c97acbafc634cf6", "6881477a3c04de798ee3c30edfa00384da38961a",
"support" "support"
], ],
"tools/wptrunner/wptrunner/wptlogging.py": [ "tools/wptrunner/wptrunner/wptlogging.py": [

View file

@ -58,6 +58,9 @@ def set_defaults(kwargs):
if kwargs["include_manifest"] is None and "include_manifest" in paths: if kwargs["include_manifest"] is None and "include_manifest" in paths:
kwargs["include_manifest"] = paths["include_manifest"] kwargs["include_manifest"] = paths["include_manifest"]
if kwargs["manifest_update"] is None:
kwargs["manifest_update"] = False
if kwargs["binary"] is None: if kwargs["binary"] is None:
bin_dir = "release" if kwargs["release"] else "debug" bin_dir = "release" if kwargs["release"] else "debug"
bin_name = "servo" bin_name = "servo"

View file

@ -47,7 +47,7 @@ def create_parser(product_choices=None):
TEST is either the full path to a test file to run, or the URL of a test excluding TEST is either the full path to a test file to run, or the URL of a test excluding
scheme host and port.""") scheme host and port.""")
parser.add_argument("--manifest-update", action="store_true", default=True, parser.add_argument("--manifest-update", action="store_true", default=None,
help="Regenerate the test manifest.") help="Regenerate the test manifest.")
parser.add_argument("--no-manifest-update", action="store_false", dest="manifest_update", parser.add_argument("--no-manifest-update", action="store_false", dest="manifest_update",
help="Prevent regeneration of the test manifest.") help="Prevent regeneration of the test manifest.")
@ -431,6 +431,9 @@ def check_args(kwargs):
if kwargs["product"] is None: if kwargs["product"] is None:
kwargs["product"] = "firefox" kwargs["product"] = "firefox"
if kwargs["manifest_update"] is None:
kwargs["manifest_update"] = True
if "sauce" in kwargs["product"]: if "sauce" in kwargs["product"]:
kwargs["pause_after_test"] = False kwargs["pause_after_test"] = False