diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/testing_commands.py | 6 | ||||
| -rw-r--r-- | python/wpt/run.py | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index 845b09b622a..860217d062a 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -432,9 +432,9 @@ class MachCommands(CommandBase): return [py, avd, apk] @Command('test-jquery', description='Run the jQuery test suite', category='testing') - @CommandBase.common_command_arguments(build_configuration=False, build_type=True) - def test_jquery(self, build_type: BuildType): - return self.jquery_test_runner("test", build_type) + @CommandBase.common_command_arguments(binary_selection=True) + def test_jquery(self, servo_binary: str): + return self.jquery_test_runner("test", servo_binary) @Command('test-dromaeo', description='Run the Dromaeo test suite', category='testing') @CommandArgument('tests', default=["recommended"], nargs="...", help="Specific tests to run") diff --git a/python/wpt/run.py b/python/wpt/run.py index 97639ff34b6..b40287cbd96 100644 --- a/python/wpt/run.py +++ b/python/wpt/run.py @@ -51,6 +51,11 @@ def run_tests(default_binary_path: str, **kwargs): os.environ["RUST_BACKTRACE"] = "1" os.environ["HOST_FILE"] = os.path.join(SERVO_ROOT, "tests", "wpt", "hosts") + # The pytest framework used in the webdriver conformance tests dumps the + # environment variables when unexpected results occur, and this variable + # makes CI logs unreadable. + github_context = os.environ.pop("GITHUB_CONTEXT", None) + set_if_none(kwargs, "product", "servo") set_if_none(kwargs, "config", os.path.join(WPT_PATH, "config.ini")) set_if_none(kwargs, "include_manifest", os.path.join(WPT_PATH, "include.ini")) @@ -142,6 +147,9 @@ def run_tests(default_binary_path: str, **kwargs): kwargs["pause_after_test"] = False wptrunner.run_tests(**kwargs) + if github_context: + os.environ["GITHUB_CONTEXT"] = github_context + # Use the second run to mark tests from the first run as flaky, but # discard the results otherwise. # TODO: It might be a good idea to send the new results to the |