Changeset 249500 in webkit

Timestamp:

Sep 4, 2019, 2:25:54 PM (7 years ago)

Author:

Jonathan Bedard

Message:

run-api-tests: Add support for specifying additional environment variables
​https://bugs.webkit.org/show_bug.cgi?id=201311
<rdar://problem/54852698>

Reviewed by Daniel Bates.

• Scripts/webkitpy/api_tests/run_api_tests.py:

(parse_args): Add --additional-env-var flag.

• Scripts/webkitpy/port/base.py:

(Port._append_value_colon_separated): Use os.pathsep instead of ':'.
(Port.environment_for_api_tests): Add the values from --additional-env-var to the
environment.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/api_tests/run_api_tests.py (modified) (1 diff)
• Scripts/webkitpy/port/base.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-09-04  Jonathan Bedard  <jbedard@apple.com>
+
+        run-api-tests: Add support for specifying additional environment variables
+        https://bugs.webkit.org/show_bug.cgi?id=201311
+        <rdar://problem/54852698>
+
+        Reviewed by Daniel Bates.
+
+        * Scripts/webkitpy/api_tests/run_api_tests.py:
+        (parse_args): Add --additional-env-var flag.
+        * Scripts/webkitpy/port/base.py:
+        (Port._append_value_colon_separated): Use os.pathsep instead of ':'.
+        (Port.environment_for_api_tests): Add the values from --additional-env-var to the
+        environment.
+
 2019-09-04  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/Scripts/webkitpy/api_tests/run_api_tests.py

@@ -137 +137 @@
         optparse.make_option('--force', action='store_true', default=False,
                              help='Run all tests, even DISABLED tests'),
+        optparse.make_option('--additional-env-var', type='string', action='append', default=[],
+                             help='Passes that environment variable to the tests (--additional-env-var=NAME=VALUE)'),
     ]))
     option_group_definitions.append(('Upload Options', upload_options()))

trunk/Tools/Scripts/webkitpy/port/base.py

@@ -268 +268 @@
     def environment_for_api_tests(self):
         build_root_path = str(self._build_path())
-        return {
-            'DYLD_LIBRARY_PATH': build_root_path,
-            '__XPC_DYLD_LIBRARY_PATH': build_root_path,
-            'DYLD_FRAMEWORK_PATH': build_root_path,
-            '__XPC_DYLD_FRAMEWORK_PATH': build_root_path,
-        }
+        environment = self.setup_environ_for_server()
+        for name in ['DYLD_LIBRARY_PATH', '__XPC_DYLD_LIBRARY_PATH', 'DYLD_FRAMEWORK_PATH', '__XPC_DYLD_FRAMEWORK_PATH']:
+            self._append_value_colon_separated(environment, name, build_root_path)
+
+        return environment
 
     def _check_driver(self):
@@ -965 +964 @@
     @staticmethod
     def _append_value_colon_separated(env, name, value):
-        assert ":" not in value
+        assert os.pathsep not in value
         if name in env and env[name]:
-            env[name] = env[name] + ":" + value
+            env[name] = env[name] + os.pathsep + value
         else:
             env[name] = value