Bug 1956843 - ./mach test <path to xpcshell test file> --profiler should work, r=jmaher.

Differential Revision: https://phabricator.services.mozilla.com/D243324

testing/xpcshell/runxpcshelltests.py

@@ -30,6 +30,10 @@ from threading import Event, Thread, Timer, current_thread
 
 import mozdebug
 import six
+from mozgeckoprofiler import (
+    symbolicate_profile_json,
+    view_gecko_profile,
+)
 from mozserve import Http3Server
 
 try:
@@ -224,6 +228,7 @@ class XPCShellTestThread(Thread):
         self.timeoutAsPass = kwargs.get("timeoutAsPass")
         self.crashAsPass = kwargs.get("crashAsPass")
         self.conditionedProfileDir = kwargs.get("conditionedProfileDir")
+        self.profiler = kwargs.get("profiler")
         if self.runFailures:
             self.retry = False
 
@@ -859,6 +864,18 @@ class XPCShellTestThread(Thread):
         if self.test_object.get("subprocess") == "true":
             self.env["PYTHON"] = sys.executable
 
+        if self.profiler:
+            if not self.singleFile:
+                self.log.error(
+                    "The --profiler flag is currently only supported when running a single test"
+                )
+            else:
+                self.env["MOZ_PROFILER_STARTUP"] = "1"
+                profile_path = os.path.join(
+                    self.profileDir, "profile_" + os.path.basename(name) + ".json"
+                )
+                self.env["MOZ_PROFILER_SHUTDOWN"] = profile_path
+
         if (
             self.test_object.get("headless", "true" if self.headless else None)
             == "true"
@@ -1041,6 +1058,9 @@ class XPCShellTestThread(Thread):
 
         finally:
             self.postCheck(proc)
+            if self.profiler and self.singleFile:
+                symbolicate_profile_json(profile_path, self.symbolsPath)
+                view_gecko_profile(profile_path)
             self.clean_temp_dirs(path)
 
         if gotSIGINT:
@@ -1832,6 +1852,7 @@ class XPCShellTests(object):
         self.conditionedProfile = options.get("conditionedProfile")
         self.repeat = options.get("repeat", 0)
         self.variant = options.get("variant", "")
+        self.profiler = options.get("profiler")
 
         if self.variant == "msix":
             self.appPath = options.get("msixAppPath")
@@ -1999,6 +2020,7 @@ class XPCShellTests(object):
             "crashAsPass": self.crashAsPass,
             "conditionedProfileDir": self.conditioned_profile_dir,
             "repeat": self.repeat,
+            "profiler": self.profiler,
         }
 
         if self.sequential:

testing/xpcshell/xpcshellcommandline.py

@@ -366,6 +366,15 @@ def add_common_arguments(parser):
         dest="repeat",
         help="repeat the test X times, default [0]",
     )
+    parser.add_argument(
+        "--profiler",
+        action="store_true",
+        default=False,
+        dest="profiler",
+        help="Run the Firefox Profiler and get a performance profile of the "
+        "test. This is useful to find performance issues, and also "
+        "to see what exactly the test is doing.",
+    )
 
 
 def add_remote_arguments(parser):