| Index: content/test/gpu/generate_buildbot_json.py
|
| diff --git a/content/test/gpu/generate_buildbot_json.py b/content/test/gpu/generate_buildbot_json.py
|
| index 48e817708036675445e381b242a1f741cdc8eb01..89617dc2080382bd709fb1f7a2f12984477dbe37 100755
|
| --- a/content/test/gpu/generate_buildbot_json.py
|
| +++ b/content/test/gpu/generate_buildbot_json.py
|
| @@ -444,6 +444,7 @@ FYI_WATERFALL = {
|
| 'build_config': 'Release',
|
| 'swarming': True,
|
| 'os_type': 'mac',
|
| + 'is_asan': True,
|
| },
|
| 'Linux Release (NVIDIA)': {
|
| 'swarming_dimensions': [
|
| @@ -1251,6 +1252,7 @@ TELEMETRY_GPU_INTEGRATION_TESTS = {
|
| 'allow_on_android': True,
|
| },
|
| ],
|
| + 'asan_args': ['--is-asan'],
|
| },
|
| 'webgl_conformance_d3d9_tests': {
|
| 'tester_configs': [
|
| @@ -1264,6 +1266,7 @@ TELEMETRY_GPU_INTEGRATION_TESTS = {
|
| 'extra_browser_args': [
|
| '--use-angle=d3d9',
|
| ],
|
| + 'asan_args': ['--is-asan'],
|
| },
|
| 'webgl_conformance_gl_tests': {
|
| 'tester_configs': [
|
| @@ -1305,6 +1308,7 @@ TELEMETRY_GPU_INTEGRATION_TESTS = {
|
| 'extra_browser_args': [
|
| '--use-angle=gl',
|
| ],
|
| + 'asan_args': ['--is-asan'],
|
| },
|
| 'webgl_conformance_angle_tests': {
|
| 'tester_configs': [
|
| @@ -1318,6 +1322,7 @@ TELEMETRY_GPU_INTEGRATION_TESTS = {
|
| 'extra_browser_args': [
|
| '--use-gl=angle',
|
| ],
|
| + 'asan_args': ['--is-asan'],
|
| },
|
| 'webgl_conformance_d3d11_passthrough': {
|
| 'tester_configs': [
|
| @@ -1332,6 +1337,7 @@ TELEMETRY_GPU_INTEGRATION_TESTS = {
|
| '--use-angle=d3d11',
|
| '--use-passthrough-cmd-decoder',
|
| ],
|
| + 'asan_args': ['--is-asan'],
|
| },
|
| 'webgl2_conformance_tests': {
|
| 'tester_configs': [
|
| @@ -1361,6 +1367,7 @@ TELEMETRY_GPU_INTEGRATION_TESTS = {
|
| '--read-abbreviated-json-results-from=' + \
|
| '../../content/test/data/gpu/webgl2_conformance_tests_output.json',
|
| ],
|
| + 'asan_args': ['--is-asan'],
|
| 'swarming': {
|
| # These tests currently take about an hour and fifteen minutes
|
| # to run. Split them into roughly 5-minute shards.
|
| @@ -1404,6 +1411,7 @@ TELEMETRY_GPU_INTEGRATION_TESTS = {
|
| '--read-abbreviated-json-results-from=' + \
|
| '../../content/test/data/gpu/webgl2_conformance_tests_output.json',
|
| ],
|
| + 'asan_args': ['--is-asan'],
|
| 'swarming': {
|
| # These tests currently take about an hour and fifteen minutes
|
| # to run. Split them into roughly 5-minute shards.
|
| @@ -1457,6 +1465,9 @@ def matches_swarming_dimensions(tester_config, dimension_sets):
|
| def is_android(tester_config):
|
| return tester_config['os_type'] == 'android'
|
|
|
| +def is_asan(tester_config):
|
| + return tester_config.get('is_asan', False)
|
| +
|
| def tester_config_matches_tester(tester_name, tester_config, tc, is_fyi,
|
| check_waterfall):
|
| if check_waterfall:
|
| @@ -1627,6 +1638,9 @@ def generate_isolated_test(tester_name, tester_config, test, test_config,
|
| if 'android_args' in test_config and is_android(tester_config):
|
| test_args.extend(substitute_args(tester_config,
|
| test_config['android_args']))
|
| + if 'asan_args' in test_config and is_asan(tester_config):
|
| + test_args.extend(substitute_args(tester_config,
|
| + test_config['asan_args']))
|
| # The step name must end in 'test' or 'tests' in order for the
|
| # results to automatically show up on the flakiness dashboard.
|
| # (At least, this was true some time ago.) Continue to use this
|
|
|