1613025 - jstests.py should pass web-platform/meta directory inside OBJDIR to wpttest.get_run_info

Status: RESOLVED FIXED

(Core :: JavaScript Engine, task, P1)

Description

[Tooru Fujisawa [:arai]]

https://searchfox.org/mozilla-central/rev/2e355fa82aaa87e8424a9927c8136be184eeb6c7/testing/web-platform/tests/tools/wptrunner/wptrunner/wpttest.py#81-93

def get_run_info(metadata_root, product, **kwargs):
    return RunInfo(metadata_root, product, **kwargs)


class RunInfo(dict):
    def __init__(self, metadata_root, product, debug,
                 browser_version=None,
                 browser_channel=None,
                 verify=None,
                 extras=None,
                 enable_webrender=False):
        import mozinfo
        self._update_mozinfo(metadata_root)

https://searchfox.org/mozilla-central/rev/2e355fa82aaa87e8424a9927c8136be184eeb6c7/testing/web-platform/tests/tools/wptrunner/wptrunner/wpttest.py#126-139

    def _update_mozinfo(self, metadata_root):
        """Add extra build information from a mozinfo.json file in a parent
        directory"""
        import mozinfo

        path = metadata_root
        dirs = set()
        while path != os.path.expanduser('~'):
            if path in dirs:
                break
            dirs.add(str(path))
            path = os.path.split(path)[0]

        mozinfo.find_and_update_from_json(*dirs)

given that metadata_root is used for looking for mozinfo.json inside OBJDIR,
get_run_info should receive web-platform/meta directory inside OBJDIR
(or, maybe it just should receive OBJDIR itself?)

then, jstests.py passes metadata_path in config, that points in-tree web-platform/meta directory.

https://searchfox.org/mozilla-central/rev/2e355fa82aaa87e8424a9927c8136be184eeb6c7/js/src/tests/jstests.py#382

    run_info = wpttest.get_run_info(kwargs["test_paths"]["/"]["metadata_path"],

so, it won't find mozinfo.json inside OBJDIR.

Comment 1

[Tooru Fujisawa [:arai]]

running try with a quick workaround
https://treeherder.mozilla.org/#/jobs?repo=try&revision=7f9f72c776d79a4eb6d73823f8ddcd4b0b31d8f0

Comment 2

[Tooru Fujisawa [:arai]]

Attachment: Bug 1613025 - Use run_info instead of metadata_path, to get web-platform inside OBJDIR. r?jgraham

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/365e6997c298
Use run_info instead of metadata_path, to get web-platform inside OBJDIR. r=jgraham

Comment 4

[Cosmin Sabou [:CosminS]]

https://hg.mozilla.org/mozilla-central/rev/365e6997c298