Skip to content
Permalink
Browse files

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

Linux WPT tasks on our CI don’t have rustup installed.
  • Loading branch information
SimonSapin committed Jan 2, 2020
1 parent 1d3fdc4 commit 8fc072a375378dcc73d2e348d8e46a4d735e6210
Showing with 0 additions and 10 deletions.
  1. +0 −10 python/servo/testing_commands.py
@@ -199,7 +199,6 @@ def suite_for_path(self, path_arg):
def test_perf(self, base=None, date=None, submit=False):
self.set_software_rendering_env(True, False)

self.ensure_bootstrapped()
env = self.build_env()
cmd = ["bash", "test_perf.sh"]
if base:
@@ -370,8 +369,6 @@ def test_tidy(self, all_files, no_wpt, no_progress, self_test, stylo, force_cpp)
@CommandArgument('tests', default=None, nargs="...",
help="Specific tests to run, relative to the tests directory")
def test_webidl(self, quiet, tests):
self.ensure_bootstrapped()

test_file_dir = path.abspath(path.join(PROJECT_TOPLEVEL_PATH, "components", "script",
"dom", "bindings", "codegen", "parser"))
# For the `import WebIDL` in runtests.py
@@ -389,7 +386,6 @@ def test_webidl(self, quiet, tests):
category='testing',
parser=create_parser_wpt)
def test_wpt_failure(self, **kwargs):
self.ensure_bootstrapped()
kwargs["pause_after_test"] = False
kwargs["include"] = ["infrastructure/failing-test.html"]
return not self._test_wpt(**kwargs)
@@ -399,7 +395,6 @@ def test_wpt_failure(self, **kwargs):
category='testing',
parser=create_parser_wpt)
def test_wpt(self, **kwargs):
self.ensure_bootstrapped()
ret = self.run_test_list_or_dispatch(kwargs["test_list"], "wpt", self._test_wpt, **kwargs)
if kwargs["always_succeed"]:
return 0
@@ -499,7 +494,6 @@ def format_code(self):
category='testing',
parser=updatecommandline.create_parser())
def update_wpt(self, **kwargs):
self.ensure_bootstrapped()
run_file = path.abspath(path.join("tests", "wpt", "update.py"))
patch = kwargs.get("patch", False)

@@ -717,7 +711,6 @@ def compare_dromaeo(self, params):
str(c1).ljust(width_col3), str(d1).ljust(width_col4)))

def jquery_test_runner(self, cmd, release, dev):
self.ensure_bootstrapped()
base_dir = path.abspath(path.join("tests", "jquery"))
jquery_dir = path.join(base_dir, "jquery")
run_file = path.join(base_dir, "run_jquery.py")
@@ -737,7 +730,6 @@ def jquery_test_runner(self, cmd, release, dev):
return call([run_file, cmd, bin_path, base_dir])

def dromaeo_test_runner(self, tests, release, dev):
self.ensure_bootstrapped()
base_dir = path.abspath(path.join("tests", "dromaeo"))
dromaeo_dir = path.join(base_dir, "dromaeo")
run_file = path.join(base_dir, "run_dromaeo.py")
@@ -970,8 +962,6 @@ def update_net_cookies(self):
@CommandArgument('--version', default='2.0.0',
help='WebGL conformance suite version')
def update_webgl(self, version=None):
self.ensure_bootstrapped()

base_dir = path.abspath(path.join(PROJECT_TOPLEVEL_PATH,
"tests", "wpt", "mozilla", "tests", "webgl"))
run_file = path.join(base_dir, "tools", "import-conformance-tests.py")

0 comments on commit 8fc072a

Please sign in to comment.
You can’t perform that action at this time.