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

Merge loading and updating manifest states when syncing.

Browse source
This commit is contained in:
Josh Matthews 2020-07-10 11:05:33 -04:00
parent aec3ce801b
commit f84d03b070
2 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/wpt/metadata/MANIFEST.json
View file

@ -355728,7 +355728,7 @@
[] []
], ],
"sync.py": [ "sync.py": [
"0a41f706ebc3760729d9ba553076fe0d7e0b40b8", "c3da2098d3c55dd5a79fa662a112335a03fcaa33",
[] []
], ],
"tree.py": [ "tree.py": [

19
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/sync.py
View file

@ -92,24 +92,18 @@ class GetSyncTargetCommit(Step):
self.logger.debug("New base commit is %s" % state.sync_commit.sha1) self.logger.debug("New base commit is %s" % state.sync_commit.sha1)
class LoadManifest(Step): class UpdateManifest(Step):
"""Load the test manifest""" """Update the manifest to match the tests in the sync tree checkout"""
provides = ["manifest_path", "test_manifest"] provides = ["manifest_path", "test_manifest"]
def create(self, state): def create(self, state):
from manifest import manifest from manifest import manifest
state.manifest_path = os.path.join(state.metadata_path, "MANIFEST.json") state.manifest_path = os.path.join(state.metadata_path, "MANIFEST.json")
state.test_manifest = manifest.Manifest(state.sync["path"], "/") state.test_manifest = manifest.load_and_update(state.sync["path"],
state.manifest_path,
"/",
class UpdateManifest(Step): write_manifest=True)
"""Update the manifest to match the tests in the sync tree checkout"""
def create(self, state):
from manifest import manifest, update
update.update(state.sync["path"], state.test_manifest)
manifest.write(state.test_manifest, state.manifest_path)
class CopyWorkTree(Step): class CopyWorkTree(Step):
@ -149,7 +143,6 @@ class SyncFromUpstreamRunner(StepRunner):
"""(Sub)Runner for doing an upstream sync""" """(Sub)Runner for doing an upstream sync"""
steps = [UpdateCheckout, steps = [UpdateCheckout,
GetSyncTargetCommit, GetSyncTargetCommit,
LoadManifest,
UpdateManifest, UpdateManifest,
CopyWorkTree, CopyWorkTree,
CreateSyncPatch] CreateSyncPatch]