aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-06-06 22:54:13 -0500
committerbors-servo <lbergstrom+bors@mozilla.com>2016-06-06 22:54:13 -0500
commit1e968b0d3f72199d69f35831bcc9e8ed7d4bbc33 (patch)
treed7ea32c107934cbcdcae6118c1ba8876cfc2fc7f
parentbc52617d3351d64cfd1479c5088b591370529f59 (diff)
parent04b062b2fbab458e5594c11216ec7950231c21f5 (diff)
downloadservo-1e968b0d3f72199d69f35831bcc9e8ed7d4bbc33.tar.gz
servo-1e968b0d3f72199d69f35831bcc9e8ed7d4bbc33.zip
Auto merge of #11516 - DDEFISHER:master, r=metajack
add update-manifest command - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #11369 <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11516) <!-- Reviewable:end -->
-rw-r--r--python/servo/testing_commands.py9
-rw-r--r--tests/wpt/README.md12
2 files changed, 21 insertions, 0 deletions
diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
index aced1401c6f..fb0d0d20415 100644
--- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -347,6 +347,15 @@ class MachCommands(CommandBase):
execfile(run_file, run_globals)
return run_globals["run_tests"](**kwargs)
+ @Command('update-manifest',
+ description='run test-wpt --manifest-update SKIP_TESTS to regenerate MANIFEST.json',
+ category='testing',
+ parser=create_parser_wpt)
+ def update_manifest(self, **kwargs):
+ kwargs['test_list'].append(str('SKIP_TESTS'))
+ kwargs['manifest_update'] = True
+ return self.test_wpt(**kwargs)
+
@Command('update-wpt',
description='Update the web platform tests',
category='testing',
diff --git a/tests/wpt/README.md b/tests/wpt/README.md
index 362e2208d36..e0aa6406c41 100644
--- a/tests/wpt/README.md
+++ b/tests/wpt/README.md
@@ -181,3 +181,15 @@ tool written for gecko reftests.
The reftest analyzer allows pixel-level comparison of the test and reference
screenshots. Tests that both fail and have an unexpected result are marked
with a `!`.
+
+Updating the WPT manifest
+=========================
+
+MANIFEST.json can be regenerated automatically with the mach command `update-manifest` e.g.
+
+ ./mach update-manifest
+
+This is equivalent to running
+
+ ./mach test-wpt --manifest-update SKIP_TESTS
+