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

Don’t run ensure_bootstrapped when rustup is not used at all.

Browse source 
Linux WPT tasks on our CI don’t have rustup installed.
This commit is contained in:
Simon Sapin 2020-01-02 19:25:01 +01:00
parent 1d3fdc471e
commit 8fc072a375
1 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
python/servo/testing_commands.py
View file

@ -199,7 +199,6 @@ class MachCommands(CommandBase):
def test_perf(self, base=None, date=None, submit=False): def test_perf(self, base=None, date=None, submit=False):
self.set_software_rendering_env(True, False) self.set_software_rendering_env(True, False)
self.ensure_bootstrapped()
env = self.build_env() env = self.build_env()
cmd = ["bash", "test_perf.sh"] cmd = ["bash", "test_perf.sh"]
if base: if base:
@ -370,8 +369,6 @@ class MachCommands(CommandBase):
@CommandArgument('tests', default=None, nargs="...", @CommandArgument('tests', default=None, nargs="...",
help="Specific tests to run, relative to the tests directory") help="Specific tests to run, relative to the tests directory")
def test_webidl(self, quiet, tests): def test_webidl(self, quiet, tests):
self.ensure_bootstrapped()
test_file_dir = path.abspath(path.join(PROJECT_TOPLEVEL_PATH, "components", "script", test_file_dir = path.abspath(path.join(PROJECT_TOPLEVEL_PATH, "components", "script",
"dom", "bindings", "codegen", "parser")) "dom", "bindings", "codegen", "parser"))
# For the `import WebIDL` in runtests.py # For the `import WebIDL` in runtests.py
@ -389,7 +386,6 @@ class MachCommands(CommandBase):
category='testing', category='testing',
parser=create_parser_wpt) parser=create_parser_wpt)
def test_wpt_failure(self, **kwargs): def test_wpt_failure(self, **kwargs):
self.ensure_bootstrapped()
kwargs["pause_after_test"] = False kwargs["pause_after_test"] = False
kwargs["include"] = ["infrastructure/failing-test.html"] kwargs["include"] = ["infrastructure/failing-test.html"]
return not self._test_wpt(**kwargs) return not self._test_wpt(**kwargs)
@ -399,7 +395,6 @@ class MachCommands(CommandBase):
category='testing', category='testing',
parser=create_parser_wpt) parser=create_parser_wpt)
def test_wpt(self, **kwargs): def test_wpt(self, **kwargs):
self.ensure_bootstrapped()
ret = self.run_test_list_or_dispatch(kwargs["test_list"], "wpt", self._test_wpt, **kwargs) ret = self.run_test_list_or_dispatch(kwargs["test_list"], "wpt", self._test_wpt, **kwargs)
if kwargs["always_succeed"]: if kwargs["always_succeed"]:
return 0 return 0
@ -499,7 +494,6 @@ class MachCommands(CommandBase):
category='testing', category='testing',
parser=updatecommandline.create_parser()) parser=updatecommandline.create_parser())
def update_wpt(self, **kwargs): def update_wpt(self, **kwargs):
self.ensure_bootstrapped()
run_file = path.abspath(path.join("tests", "wpt", "update.py")) run_file = path.abspath(path.join("tests", "wpt", "update.py"))
patch = kwargs.get("patch", False) patch = kwargs.get("patch", False)
@ -717,7 +711,6 @@ class MachCommands(CommandBase):
str(c1).ljust(width_col3), str(d1).ljust(width_col4))) str(c1).ljust(width_col3), str(d1).ljust(width_col4)))
def jquery_test_runner(self, cmd, release, dev): def jquery_test_runner(self, cmd, release, dev):
self.ensure_bootstrapped()
base_dir = path.abspath(path.join("tests", "jquery")) base_dir = path.abspath(path.join("tests", "jquery"))
jquery_dir = path.join(base_dir, "jquery") jquery_dir = path.join(base_dir, "jquery")
run_file = path.join(base_dir, "run_jquery.py") run_file = path.join(base_dir, "run_jquery.py")
@ -737,7 +730,6 @@ class MachCommands(CommandBase):
return call([run_file, cmd, bin_path, base_dir]) return call([run_file, cmd, bin_path, base_dir])
def dromaeo_test_runner(self, tests, release, dev): def dromaeo_test_runner(self, tests, release, dev):
self.ensure_bootstrapped()
base_dir = path.abspath(path.join("tests", "dromaeo")) base_dir = path.abspath(path.join("tests", "dromaeo"))
dromaeo_dir = path.join(base_dir, "dromaeo") dromaeo_dir = path.join(base_dir, "dromaeo")
run_file = path.join(base_dir, "run_dromaeo.py") run_file = path.join(base_dir, "run_dromaeo.py")
@ -970,8 +962,6 @@ testing/web-platform/mozilla/tests for Servo-only tests""" % reference_path)
@CommandArgument('--version', default='2.0.0', @CommandArgument('--version', default='2.0.0',
help='WebGL conformance suite version') help='WebGL conformance suite version')
def update_webgl(self, version=None): def update_webgl(self, version=None):
self.ensure_bootstrapped()
base_dir = path.abspath(path.join(PROJECT_TOPLEVEL_PATH, base_dir = path.abspath(path.join(PROJECT_TOPLEVEL_PATH,
"tests", "wpt", "mozilla", "tests", "webgl")) "tests", "wpt", "mozilla", "tests", "webgl"))
run_file = path.join(base_dir, "tools", "import-conformance-tests.py") run_file = path.join(base_dir, "tools", "import-conformance-tests.py")