diff options
| -rw-r--r-- | base/base_unittests.isolate | 2 | ||||
| -rw-r--r-- | cc/cc_unittests.isolate | 7 | ||||
| -rw-r--r-- | chrome/angle_unittests.isolate | 7 | ||||
| -rw-r--r-- | chrome/browser_tests.isolate | 2 | ||||
| -rw-r--r-- | chrome/chrome.isolate | 2 | ||||
| -rw-r--r-- | chrome/interactive_ui_tests.isolate | 7 | ||||
| -rw-r--r-- | chrome/sync_integration_tests.isolate | 9 | ||||
| -rw-r--r-- | chrome/unit_tests.isolate | 18 | ||||
| -rw-r--r-- | components/components_browsertests.isolate | 10 | ||||
| -rw-r--r-- | components/components_unittests.isolate | 9 | ||||
| -rw-r--r-- | content/content_browsertests.isolate | 8 | ||||
| -rw-r--r-- | content/content_unittests.isolate | 4 | ||||
| -rw-r--r-- | extensions/extensions_browsertests.isolate | 7 | ||||
| -rw-r--r-- | gpu/gpu_unittests.isolate | 7 | ||||
| -rw-r--r-- | media/media_unittests.isolate | 8 | ||||
| -rw-r--r-- | net/net_unittests.isolate | 2 | ||||
| -rw-r--r-- | ui/app_list/app_list_unittests.isolate | 8 | ||||
| -rw-r--r-- | ui/base/ui_base_unittests.isolate | 9 | ||||
| -rw-r--r-- | ui/events/events_unittests.isolate | 8 | ||||
| -rw-r--r-- | ui/message_center/message_center_unittests.isolate | 8 | ||||
| -rw-r--r-- | ui/touch_selection/ui_touch_selection_unittests.isolate | 7 |
21 files changed, 133 insertions, 16 deletions
diff --git a/base/base_unittests.isolate b/base/base_unittests.isolate index 0822b24..2e33cc0 100644 --- a/base/base_unittests.isolate +++ b/base/base_unittests.isolate @@ -58,7 +58,7 @@ ], }, }], - ['OS=="mac" and asan==1', { + ['OS=="mac" and asan==1 and fastbuild==0', { 'variables': { 'files': [ '<(PRODUCT_DIR)/base_unittests.dSYM/', diff --git a/cc/cc_unittests.isolate b/cc/cc_unittests.isolate index 5d652d9..db47aab 100644 --- a/cc/cc_unittests.isolate +++ b/cc/cc_unittests.isolate @@ -82,6 +82,13 @@ ], }, }], + ['OS=="mac" and asan==1 and fastbuild==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/cc_unittests.dSYM/', + ], + }, + }], ], 'includes': [ '../base/base.isolate', diff --git a/chrome/angle_unittests.isolate b/chrome/angle_unittests.isolate index 1cb7b23..7205ea3 100644 --- a/chrome/angle_unittests.isolate +++ b/chrome/angle_unittests.isolate @@ -16,5 +16,12 @@ ], }, }], + ['OS=="mac" and asan==1 and fastbuild==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/angle_unittests.dSYM/', + ], + }, + }], ], } diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index 2624378c..91a3a16 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -208,7 +208,7 @@ ], }, }], - ['OS=="mac" and asan==1', { + ['OS=="mac" and asan==1 and fastbuild==0', { 'variables': { 'files': [ '<(PRODUCT_DIR)/browser_tests.dSYM/', diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate index 061cc23..b8ed338 100644 --- a/chrome/chrome.isolate +++ b/chrome/chrome.isolate @@ -77,7 +77,7 @@ ], }, }], - ['OS=="mac" and asan==1', { + ['OS=="mac" and asan==1 and fastbuild==0', { 'variables': { 'files': [ '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework.dSYM/', diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate index 1d78389..2ccf137 100644 --- a/chrome/interactive_ui_tests.isolate +++ b/chrome/interactive_ui_tests.isolate @@ -70,10 +70,15 @@ ], }, }], - ['OS=="mac" and asan==1', { + ['OS=="mac" and asan==1 and fastbuild==0', { 'variables': { 'files': [ + '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', + '<(PRODUCT_DIR)/<(mac_product_name).app.dSYM/', + '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/', '<(PRODUCT_DIR)/interactive_ui_tests.dSYM/', + '<(PRODUCT_DIR)/osmesa.so.dSYM/', + '<(PRODUCT_DIR)/ppapi_tests.plugin.dSYM/', ], }, }], diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate index 3c5e0e1..b5ea975 100644 --- a/chrome/sync_integration_tests.isolate +++ b/chrome/sync_integration_tests.isolate @@ -66,6 +66,15 @@ ], }, }], + ['OS=="mac" and asan==1 and fastbuild==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework.dSYM/', + '<(PRODUCT_DIR)/<(mac_product_name).app.dSYM/', + '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/', + ], + }, + }], ['OS=="win"', { 'variables': { 'files': [ diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate index 3c12a33..bee477c 100644 --- a/chrome/unit_tests.isolate +++ b/chrome/unit_tests.isolate @@ -80,13 +80,6 @@ ], }, }], - ['OS=="mac" and asan==1', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/unit_tests.dSYM/', - ], - }, - }], ['OS=="linux" or OS=="mac"', { 'variables': { 'read_only': 1, @@ -102,6 +95,17 @@ ], }, }], + ['OS=="mac" and asan==1 and fastbuild==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework.dSYM/', + '<(PRODUCT_DIR)/exif.so.dSYM/', + '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/', + '<(PRODUCT_DIR)/osmesa.so.dSYM/', + '<(PRODUCT_DIR)/unit_tests.dSYM/', + ], + }, + }], ['OS=="mac" or OS=="win"', { 'variables': { 'command': [ diff --git a/components/components_browsertests.isolate b/components/components_browsertests.isolate index 0ce6b0b..4ded8a7 100644 --- a/components/components_browsertests.isolate +++ b/components/components_browsertests.isolate @@ -65,5 +65,15 @@ ], }, }], + ['OS=="mac" and asan==1 and fastbuild==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/Content Shell Framework.framework.dSYM/', + '<(PRODUCT_DIR)/Content Shell Helper.app.dSYM/', + '<(PRODUCT_DIR)/Content Shell.app.dSYM/', + '<(PRODUCT_DIR)/components_browsertests.dSYM/', + ], + }, + }], ], } diff --git a/components/components_unittests.isolate b/components/components_unittests.isolate index 8ba5e75..d887acb 100644 --- a/components/components_unittests.isolate +++ b/components/components_unittests.isolate @@ -84,6 +84,15 @@ ], }, }], + ['OS=="mac" and asan==1 and fastbuild==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/components_unittests.dSYM/', + '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/', + '<(PRODUCT_DIR)/osmesa.so.dSYM/', + ], + }, + }], ], 'includes': [ '../base/base.isolate', diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate index 9de603a..926a101 100644 --- a/content/content_browsertests.isolate +++ b/content/content_browsertests.isolate @@ -86,15 +86,17 @@ ], }, }], - ['OS=="mac" and asan==1', { + ['OS=="mac" and asan==1 and fastbuild==0', { 'variables': { 'files': [ - '<(PRODUCT_DIR)/content_browsertests.dSYM/', + '<(PRODUCT_DIR)/Content Shell Framework.framework.dSYM/', + '<(PRODUCT_DIR)/Content Shell Helper.app.dSYM/', '<(PRODUCT_DIR)/Content Shell.app.dSYM/', + '<(PRODUCT_DIR)/content_browsertests.dSYM/', '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/', '<(PRODUCT_DIR)/npapi_test_plugin.plugin.dSYM/', - '<(PRODUCT_DIR)/test_netscape_plugin.plugin.dSYM/', '<(PRODUCT_DIR)/ppapi_tests.plugin.dSYM/', + '<(PRODUCT_DIR)/test_netscape_plugin.plugin.dSYM/', ], }, }], diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate index ba15585..502e225 100644 --- a/content/content_unittests.isolate +++ b/content/content_unittests.isolate @@ -97,10 +97,12 @@ ], }, }], - ['OS=="mac" and asan==1', { + ['OS=="mac" and asan==1 and fastbuild==0', { 'variables': { 'files': [ '<(PRODUCT_DIR)/content_unittests.dSYM/', + '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/', + '<(PRODUCT_DIR)/osmesa.so.dSYM/', ], }, }], diff --git a/extensions/extensions_browsertests.isolate b/extensions/extensions_browsertests.isolate index 6cae91b..7699fc1 100644 --- a/extensions/extensions_browsertests.isolate +++ b/extensions/extensions_browsertests.isolate @@ -58,6 +58,13 @@ ], }, }], + ['OS=="mac" and asan==1 and fastbuild==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/extensions_browsertests.dSYM/', + ], + }, + }], ['OS=="win" and target_arch=="ia32"', { 'variables': { 'files': [ diff --git a/gpu/gpu_unittests.isolate b/gpu/gpu_unittests.isolate index 48fb1c5..e64633c 100644 --- a/gpu/gpu_unittests.isolate +++ b/gpu/gpu_unittests.isolate @@ -58,6 +58,13 @@ ], }, }], + ['OS=="mac" and asan==1 and fastbuild==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/gpu_unittests.dSYM/', + ], + }, + }], ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 'variables': { 'files': [ diff --git a/media/media_unittests.isolate b/media/media_unittests.isolate index 669f3fc..5d8f454 100644 --- a/media/media_unittests.isolate +++ b/media/media_unittests.isolate @@ -75,6 +75,14 @@ ], }, }], + ['OS=="mac" and asan==1 and fastbuild==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/', + '<(PRODUCT_DIR)/media_unittests.dSYM/', + ], + }, + }], ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 'variables': { 'files': [ diff --git a/net/net_unittests.isolate b/net/net_unittests.isolate index 877c21e..8c6cd69 100644 --- a/net/net_unittests.isolate +++ b/net/net_unittests.isolate @@ -34,7 +34,7 @@ 'read_only': 1, }, }], - ['OS=="mac" and asan==1', { + ['OS=="mac" and asan==1 and fastbuild==0', { 'variables': { 'files': [ '<(PRODUCT_DIR)/net_unittests.dSYM/', diff --git a/ui/app_list/app_list_unittests.isolate b/ui/app_list/app_list_unittests.isolate index b657686..9862ecf 100644 --- a/ui/app_list/app_list_unittests.isolate +++ b/ui/app_list/app_list_unittests.isolate @@ -66,6 +66,14 @@ ], }, }], + ['OS=="mac" and asan==1 and fastbuild==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/app_list_unittests.dSYM/', + '<(PRODUCT_DIR)/osmesa.so.dSYM/', + ], + }, + }], ], 'includes': [ '../../base/base.isolate', diff --git a/ui/base/ui_base_unittests.isolate b/ui/base/ui_base_unittests.isolate index 7bc59c4..035db27 100644 --- a/ui/base/ui_base_unittests.isolate +++ b/ui/base/ui_base_unittests.isolate @@ -76,6 +76,15 @@ ], }, }], + ['OS=="mac" and asan==1 and fastbuild==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/osmesa.so.dSYM/', + '<(PRODUCT_DIR)/ui_base_unittests.dSYM/', + '<(PRODUCT_DIR)/ui_unittests Framework.framework.dSYM/', + ], + }, + }], ], 'includes': [ '../../base/base.isolate', diff --git a/ui/events/events_unittests.isolate b/ui/events/events_unittests.isolate index c2418cb..2a0549c 100644 --- a/ui/events/events_unittests.isolate +++ b/ui/events/events_unittests.isolate @@ -65,6 +65,14 @@ ], }, }], + ['OS=="mac" and asan==1 and fastbuild==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/events_unittests.dSYM/', + '<(PRODUCT_DIR)/osmesa.so.dSYM/', + ], + }, + }], ], 'includes': [ '../../base/base.isolate', diff --git a/ui/message_center/message_center_unittests.isolate b/ui/message_center/message_center_unittests.isolate index 74c1057..ec10058 100644 --- a/ui/message_center/message_center_unittests.isolate +++ b/ui/message_center/message_center_unittests.isolate @@ -66,6 +66,14 @@ ], }, }], + ['OS=="mac" and asan==1 and fastbuild==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/message_center_unittests.dSYM/', + '<(PRODUCT_DIR)/osmesa.so.dSYM/', + ], + }, + }], ], 'includes': [ '../../base/base.isolate', diff --git a/ui/touch_selection/ui_touch_selection_unittests.isolate b/ui/touch_selection/ui_touch_selection_unittests.isolate index 691e0a6..cfa3cff 100644 --- a/ui/touch_selection/ui_touch_selection_unittests.isolate +++ b/ui/touch_selection/ui_touch_selection_unittests.isolate @@ -51,6 +51,13 @@ ], }, }], + ['OS=="mac" and asan==1 and fastbuild==0', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/ui_touch_selection_unittests.dSYM/', + ], + }, + }], ], 'includes': [ '../../base/base.isolate', |