Changeset 246159 in webkit

Timestamp:

Jun 6, 2019, 11:44:03 AM (7 years ago)

Author:

Jonathan Bedard

Message:

webkitpluginhost: Support ASan as a style
​https://bugs.webkit.org/show_bug.cgi?id=198586
<rdar://problem/51459088>

Reviewed by Alexey Proskuryakov.

• Scripts/webkitpy/port/base.py:

(Port.configuration_for_upload): Add ASan as a style.

• Scripts/webkitpy/port/config.py:

(Config._read_configuration):
(Config):
(Config.asan): Add property to check if the ASan configuration is active.

• Scripts/webkitpy/port/config_unittest.py:

(ConfigTest.test_default_configurationscripterror):
(ConfigTest):
(ConfigTest.test_asan):

• Scripts/webkitpy/test/main.py:

(Tester._run_tests): Add Asan as a style.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/base.py (modified) (2 diffs)
• Scripts/webkitpy/port/config.py (modified) (1 diff)
• Scripts/webkitpy/port/config_unittest.py (modified) (1 diff)
• Scripts/webkitpy/test/main.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-06-06  Jonathan Bedard  <jbedard@apple.com>
+
+        webkitpluginhost: Support ASan as a style
+        https://bugs.webkit.org/show_bug.cgi?id=198586
+        <rdar://problem/51459088>
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Scripts/webkitpy/port/base.py:
+        (Port.configuration_for_upload): Add ASan as a style.
+        * Scripts/webkitpy/port/config.py:
+        (Config._read_configuration):
+        (Config):
+        (Config.asan): Add property to check if the ASan configuration is active.
+        * Scripts/webkitpy/port/config_unittest.py:
+        (ConfigTest.test_default_configuration__scripterror):
+        (ConfigTest):
+        (ConfigTest.test_asan):
+        * Scripts/webkitpy/test/main.py:
+        (Tester._run_tests): Add Asan as a style.
+
 2019-06-06  Alexey Proskuryakov  <ap@apple.com>
 

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

@@ -1584 +1584 @@
         host = self.host or host
 
+        if self.get_option('guard_malloc'):
+            style = 'guard-malloc'
+        elif self._config.asan:
+            style = 'asan'
+        else:
+            style = configuration.build_type
+
         return Upload.create_configuration(
             platform=host.platform.os_name,
@@ -1589 +1596 @@
             version_name=host.platform.os_version_name(INTERNAL_TABLE) or host.platform.os_version_name(),
             architecture=configuration.architecture,
-            style='guard-malloc' if self.get_option('guard_malloc') else configuration.build_type,
+            style=style,
             sdk=host.platform.build_version(),
         )

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

@@ -150 +150 @@
 
         return self._filesystem.read_text_file(configuration_path).rstrip()
+
+    @property
+    @memoized
+    def asan(self):
+        try:
+            return self._filesystem.exists(self._filesystem.join(self.build_directory(None), "ASan"))
+        except:
+            return False

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

@@ -157 +157 @@
         actual = c.default_configuration()
         self.assertEqual(actual, 'Release')
+
+    def test_asan(self):
+        config = self.make_config(output='foo\nfoo/Release', files={'foo/Configuration': 'Release', 'foo/ASan': 'YES'})
+        self.assertEqual(config.asan, True)
+        config = self.make_config(output='foo\nfoo/Release', files={'foo/Configuration': 'Release'})
+        self.assertEqual(config.asan, False)

trunk/Tools/Scripts/webkitpy/test/main.py

@@ -191 +191 @@
         config = Config(_host.executive, self.finder.filesystem)
         configuration_to_use = self._options.configuration or config.default_configuration()
+
         if will_run_lldb_webkit_tests:
             self.printer.write_update('Building lldbWebKitTester ...')
@@ -261 +262 @@
                     version=str(_host.platform.os_version),
                     version_name=_host.platform.os_version_name(),
-                    style=configuration_to_use,
+                    style='asan' if config.asan else configuration_to_use,
                     sdk=_host.platform.build_version(),
                 ),