Auto merge of #25417 - servo:profile, r=jdm,Manishearth

mach: automatically use the 'minimal' rustup profile + rustc-dev component

Fixes https://github.com/servo/servo/issues/25401
Fixes https://github.com/servo/servo/issues/25402

1 files changed, 2 insertions, 11 deletions

diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
index 0c107a1867b..bc29955fd79 100644
--- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -199,7 +199,6 @@ class MachCommands(CommandBase):
     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:
@@ -298,7 +297,7 @@ class MachCommands(CommandBase):
                 args += ["--", "--nocapture"]
 
             err = self.run_cargo_build_like_command("bench" if bench else "test", args, env=env, **kwargs)
-            if err is not 0:
+            if err:
                 return err
 
     @Command('test-content',
@@ -310,6 +309,7 @@ class MachCommands(CommandBase):
         return 0
 
     def install_rustfmt(self):
+        self.ensure_bootstrapped()
         with open(os.devnull, "w") as devnull:
             if self.call_rustup_run(["cargo", "fmt", "--version", "-q"],
                                     stderr=devnull) != 0:
@@ -369,8 +369,6 @@ class MachCommands(CommandBase):
     @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
@@ -388,7 +386,6 @@ class MachCommands(CommandBase):
              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)
@@ -398,7 +395,6 @@ class MachCommands(CommandBase):
              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
@@ -498,7 +494,6 @@ class MachCommands(CommandBase):
              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)
 
@@ -716,7 +711,6 @@ class MachCommands(CommandBase):
                           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")
@@ -736,7 +730,6 @@ class MachCommands(CommandBase):
         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")
@@ -969,8 +962,6 @@ testing/web-platform/mozilla/tests for Servo-only tests""" % reference_path)
     @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")