Changeset 277105 in webkit

Timestamp:

May 6, 2021 11:58:21 AM (3 years ago)

Author:

fpizlo@apple.com

Message:

Make it easy to pass XPC variables to run-benchmark
​https://bugs.webkit.org/show_bug.cgi?id=225473

Reviewed by Stephanie Lewis.

• Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:

(OSXSafariDriver.launch_url):

• Scripts/webkitpy/benchmark_runner/run_benchmark.py:

(config_argument_parser):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py (modified) (3 diffs)
• Scripts/webkitpy/benchmark_runner/run_benchmark.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-05-06  Filip Pizlo  <fpizlo@apple.com>
+
+        Make it easy to pass __XPC variables to run-benchmark
+        https://bugs.webkit.org/show_bug.cgi?id=225473
+
+        Reviewed by Stephanie Lewis.
+
+        * Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
+        (OSXSafariDriver.launch_url):
+        * Scripts/webkitpy/benchmark_runner/run_benchmark.py:
+        (config_argument_parser):
+
 2021-05-06  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py

@@ -3 +3 @@
 import logging
 import os
+import re
 import subprocess
 import time
@@ -27 +28 @@
         args = ['/Applications/Safari.app/Contents/MacOS/Safari']
         env = {}
+        for key, value in os.environ.items():
+            if re.match(r"^__XPC_", key):
+                env[key] = value
         if browser_build_path:
             browser_build_absolute_path = os.path.abspath(browser_build_path)
@@ -38 +42 @@
 
             if contains_frameworks:
-                env = {'DYLD_FRAMEWORK_PATH': browser_build_absolute_path, 'DYLD_LIBRARY_PATH': browser_build_absolute_path,
-                    '__XPC_DYLD_FRAMEWORK_PATH': browser_build_absolute_path, '__XPC_DYLD_LIBRARY_PATH': browser_build_absolute_path}
+                env['DYLD_FRAMEWORK_PATH'] = browser_build_absolute_path
+                env['DYLD_LIBRARY_PATH'] = browser_build_absolute_path
+                env['__XPC_DYLD_FRAMEWORK_PATH'] = browser_build_absolute_path
+                env['__XPC_DYLD_LIBRARY_PATH'] = browser_build_absolute_path
             elif not has_safari_app:
                 raise Exception('Could not find any framework "{}"'.format(browser_build_path))

trunk/Tools/Scripts/webkitpy/benchmark_runner/run_benchmark.py

@@ -33 +33 @@
 
 def config_argument_parser():
-    parser = argparse.ArgumentParser(description='Run browser based performance benchmarks. To run a single benchmark in the recommended way, use run-benchmark --plan. To see the vailable benchmarks, use run-benchmark --list-plans.')
+    parser = argparse.ArgumentParser(description='Run browser based performance benchmarks. To run a single benchmark in the recommended way, use run-benchmark --plan. To see the vailable benchmarks, use run-benchmark --list-plans. This script passes through the __XPC variables in its environment to the Safari process.')
     mutual_group = parser.add_mutually_exclusive_group(required=True)
     mutual_group.add_argument('--plan', help='Run a specific benchmark plan (e.g. speedometer, jetstream).')