Diff
Modified: trunk/Tools/ChangeLog (246158 => 246159)
--- trunk/Tools/ChangeLog 2019-06-06 16:53:29 UTC (rev 246158)
+++ trunk/Tools/ChangeLog 2019-06-06 18:44:03 UTC (rev 246159)
@@ -1,3 +1,24 @@
+2019-06-06 Jonathan Bedard <[email protected]>
+
+ 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 <[email protected]>
block-spammers tool doesn't block e-mail
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (246158 => 246159)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2019-06-06 16:53:29 UTC (rev 246158)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2019-06-06 18:44:03 UTC (rev 246159)
@@ -1583,12 +1583,19 @@
configuration = self.test_configuration()
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,
version=str(host.platform.os_version),
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(),
)
Modified: trunk/Tools/Scripts/webkitpy/port/config.py (246158 => 246159)
--- trunk/Tools/Scripts/webkitpy/port/config.py 2019-06-06 16:53:29 UTC (rev 246158)
+++ trunk/Tools/Scripts/webkitpy/port/config.py 2019-06-06 18:44:03 UTC (rev 246159)
@@ -149,3 +149,11 @@
return None
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
Modified: trunk/Tools/Scripts/webkitpy/port/config_unittest.py (246158 => 246159)
--- trunk/Tools/Scripts/webkitpy/port/config_unittest.py 2019-06-06 16:53:29 UTC (rev 246158)
+++ trunk/Tools/Scripts/webkitpy/port/config_unittest.py 2019-06-06 18:44:03 UTC (rev 246159)
@@ -156,3 +156,9 @@
c = self.make_config(exception=ScriptError())
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)
Modified: trunk/Tools/Scripts/webkitpy/test/main.py (246158 => 246159)
--- trunk/Tools/Scripts/webkitpy/test/main.py 2019-06-06 16:53:29 UTC (rev 246158)
+++ trunk/Tools/Scripts/webkitpy/test/main.py 2019-06-06 18:44:03 UTC (rev 246159)
@@ -190,6 +190,7 @@
start_time = time.time()
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 ...')
build_lldbwebkittester = self.finder.filesystem.join(_webkit_root, 'Tools', 'Scripts', 'build-lldbwebkittester')
@@ -260,7 +261,7 @@
platform=_host.platform.os_name,
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(),
),
details=Upload.create_details(options=self._options),
